hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lz4: fix another possible overrun 

There is one other possible overrun in the lz4 code as implemented by
Linux at this point in time (which differs from the upstream lz4
codebase, but will get synced at in a future kernel release.)  As
pointed out by Don, we also need to check the overflow in the data
itself.

While we are at it, replace the odd error return value with just a
"simple" -1 value as the return value is never used for anything other
than a basic "did this work or not" check.

Reported-by: "Don A. Bailey" <donb@securitymouse.com>
Reported-by: Willy Tarreau <w@1wt.eu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-06-24 16:59:01 -04:00
parent 206204a116
commit 4148c1f67a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/lz4/lz4_decompress.c
View File

@ -108,6 +108,8 @@ static int lz4_uncompress(const char *source, char *dest, int osize)
if (length == ML_MASK) { if (length == ML_MASK) {
for (; *ip == 255; length += 255) for (; *ip == 255; length += 255)
ip++; ip++;
if (unlikely(length > (size_t)(length + *ip)))
goto _output_error;
length += *ip++; length += *ip++;
} }
@ -157,7 +159,7 @@ static int lz4_uncompress(const char *source, char *dest, int osize)
/* write overflow error detected */ /* write overflow error detected */
_output_error: _output_error:
return (int) (-(((char *)ip) - source)); return -1;
} }
static int lz4_uncompress_unknownoutputsize(const char *source, char *dest, static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,