summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeHyeon Yeon <tom.yeon@windriver.com>2015-03-16 01:03:19 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-16 21:55:35 +0100
commitd5e7cafd69da24e6d6cc988fab6ea313a2577efc (patch)
tree9bd417b1bcb8f8f92a3de001c8d29a8e90bdf325
parent7cff4b1836a9d3f18aadd6e88fd43055e2ff4132 (diff)
downloadop-kernel-dev-d5e7cafd69da24e6d6cc988fab6ea313a2577efc.zip
op-kernel-dev-d5e7cafd69da24e6d6cc988fab6ea313a2577efc.tar.gz
LZ4 : fix the data abort issue
If the part of the compression data are corrupted, or the compression data is totally fake, the memory access over the limit is possible. This is the log from my system usning lz4 decompression. [6502]data abort, halting [6503]r0 0x00000000 r1 0x00000000 r2 0xdcea0ffc r3 0xdcea0ffc [6509]r4 0xb9ab0bfd r5 0xdcea0ffc r6 0xdcea0ff8 r7 0xdce80000 [6515]r8 0x00000000 r9 0x00000000 r10 0x00000000 r11 0xb9a98000 [6522]r12 0xdcea1000 usp 0x00000000 ulr 0x00000000 pc 0x820149bc [6528]spsr 0x400001f3 and the memory addresses of some variables at the moment are ref:0xdcea0ffc, op:0xdcea0ffc, oend:0xdcea1000 As you can see, COPYLENGH is 8bytes, so @ref and @op can access the momory over @oend. Signed-off-by: JeHyeon Yeon <tom.yeon@windriver.com> Reviewed-by: David Sterba <dsterba@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--lib/lz4/lz4_decompress.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c
index 7a85967..f0f5c5c 100644
--- a/lib/lz4/lz4_decompress.c
+++ b/lib/lz4/lz4_decompress.c
@@ -139,6 +139,9 @@ 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 ((ref + COPYLENGTH) > oend ||
+ (op + COPYLENGTH) > oend)
+ goto _output_error;
LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
while (op < cpy)
*op++ = *ref++;
OpenPOWER on IntegriCloud