Commit 4a3a9904 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

lz4: add overrun checks to lz4_uncompress_unknownoutputsize()

Jan points out that I forgot to make the needed fixes to the
lz4_uncompress_unknownoutputsize() function to mirror the changes done
in lz4_decompress() with regards to potential pointer overflows.

The only in-kernel user of this function is the zram code, which only
takes data from a valid compressed buffer that it made itself, so it's
not a big issue.  But due to external kernel modules using this
function, it's better to be safe here.
Reported-by: default avatarJan Beulich <JBeulich@suse.com>
Cc: "Don A. Bailey" <donb@securitymouse.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ecca47ce
...@@ -192,6 +192,8 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest, ...@@ -192,6 +192,8 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
int s = 255; int s = 255;
while ((ip < iend) && (s == 255)) { while ((ip < iend) && (s == 255)) {
s = *ip++; s = *ip++;
if (unlikely(length > (size_t)(length + s)))
goto _output_error;
length += s; length += s;
} }
} }
...@@ -232,6 +234,8 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest, ...@@ -232,6 +234,8 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
if (length == ML_MASK) { if (length == ML_MASK) {
while (ip < iend) { while (ip < iend) {
int s = *ip++; int s = *ip++;
if (unlikely(length > (size_t)(length + s)))
goto _output_error;
length += s; length += s;
if (s == 255) if (s == 255)
continue; continue;
...@@ -284,7 +288,7 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest, ...@@ -284,7 +288,7 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
/* write overflow error detected */ /* write overflow error detected */
_output_error: _output_error:
return (int) (-(((char *) ip) - source)); return -1;
} }
int lz4_decompress(const unsigned char *src, size_t *src_len, int lz4_decompress(const unsigned char *src, size_t *src_len,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment