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 system halt at boot kernel on x86_64 

Sometimes, on x86_64, decompression fails with the following
error:

Decompressing Linux...

Decoding failed

 -- System halted

This condition is not needed for a 64bit kernel(from commit d5e7caf):

if( ... ||
    (op + COPYLENGTH) > oend)
    goto _output_error

macro LZ4_SECURE_COPY() tests op and does not copy any data
when op exceeds the value.

added by analogy to lz4_uncompress_unknownoutputsize(...)

Signed-off-by: Krzysztof Kolasa <kkolasa@winsoft.pl>
Tested-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Tested-by: Caleb Jorden <cjorden@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Krzysztof Kolasa 2015-05-03 22:58:59 -05:00 committed by Greg Kroah-Hartman
parent 61a590fa67
commit 99b7e93c95
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/lz4/lz4_decompress.c
View File

@ -140,8 +140,12 @@ static int lz4_uncompress(const char *source, char *dest, int osize)
/* Error: request to write beyond destination buffer */ /* Error: request to write beyond destination buffer */
if (cpy > oend) if (cpy > oend)
goto _output_error; goto _output_error;
#if LZ4_ARCH64
if ((ref + COPYLENGTH) > oend)
#else
if ((ref + COPYLENGTH) > oend || if ((ref + COPYLENGTH) > oend ||
(op + COPYLENGTH) > oend) (op + COPYLENGTH) > oend)
#endif
goto _output_error; goto _output_error;
LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
while (op < cpy) while (op < cpy)
@ -266,7 +270,13 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
if (cpy > oend - COPYLENGTH) { if (cpy > oend - COPYLENGTH) {
if (cpy > oend) if (cpy > oend)
goto _output_error; /* write outside of buf */ goto _output_error; /* write outside of buf */
#if LZ4_ARCH64
if ((ref + COPYLENGTH) > oend)
#else
if ((ref + COPYLENGTH) > oend ||
(op + COPYLENGTH) > oend)
#endif
goto _output_error;
LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
while (op < cpy) while (op < cpy)
*op++ = *ref++; *op++ = *ref++;