summaryrefslogtreecommitdiffstats
path: root/lib/lz4
diff options
context:
space:
mode:
authorKrzysztof Kolasa <kkolasa@winsoft.pl>2015-05-03 22:58:59 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-24 11:56:29 -0700
commit99b7e93c95c78952724a9783de6c78def8fbfc3f (patch)
treefdd2c8f93ef829138eab5f76391851cd49cbe9cb /lib/lz4
parent61a590fa67ac3c897e7c21fd75a5c85a4671b384 (diff)
downloadlinux-99b7e93c95c78952724a9783de6c78def8fbfc3f.tar.gz
linux-99b7e93c95c78952724a9783de6c78def8fbfc3f.tar.bz2
linux-99b7e93c95c78952724a9783de6c78def8fbfc3f.zip
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>
Diffstat (limited to 'lib/lz4')
-rw-r--r--lib/lz4/lz4_decompress.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c
index 26cc6029b280..6d940c72b5fc 100644
--- a/lib/lz4/lz4_decompress.c
+++ b/lib/lz4/lz4_decompress.c
@@ -140,8 +140,12 @@ static int lz4_uncompress(const char *source, char *dest, int osize)
/* Error: request to write beyond destination buffer */
if (cpy > oend)
goto _output_error;
+#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));
while (op < cpy)
@@ -266,7 +270,13 @@ static int lz4_uncompress_unknownoutputsize(const char *source, char *dest,
if (cpy > oend - COPYLENGTH) {
if (cpy > oend)
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));
while (op < cpy)
*op++ = *ref++;