Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

lzma: fix buffer bound check error

Browse source 
Variable uncompressedSize references the space available, while outSizeFull is
the actual expected uncompressed size. Using the wrong value causes LzmaDecode
to return SZ_ERROR_INPUT_EOF. Problem was introduced in commit afca294. While
at it add additional debug message.

Signed-off-by: Antonios Vamporakis <ant@area128.com>
CC: Kees Cook <keescook@chromium.org>
CC: Simon Glass <sjg@chromium.org>
CC: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
This commit is contained in:
Antonios Vamporakis 2013-12-31 02:57:01 +01:00 committed by Tom Rini
parent cddb6b8304
commit 4d3b8a0d1b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/lzma/LzmaTools.c
View file

@ -102,7 +102,7 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
return SZ_ERROR_OUTPUT_EOF; return SZ_ERROR_OUTPUT_EOF;
/* Decompress */ /* Decompress */
outProcessed = *uncompressedSize; outProcessed = outSizeFull;
WATCHDOG_RESET(); WATCHDOG_RESET();
@ -111,6 +111,9 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
inStream + LZMA_DATA_OFFSET, &compressedSize, inStream + LZMA_DATA_OFFSET, &compressedSize,
inStream, LZMA_PROPS_SIZE, LZMA_FINISH_END, &state, &g_Alloc); inStream, LZMA_PROPS_SIZE, LZMA_FINISH_END, &state, &g_Alloc);
*uncompressedSize = outProcessed; *uncompressedSize = outProcessed;
debug("LZMA: Uncompresed ................ 0x%zx\n", outProcessed);
if (res != SZ_OK) { if (res != SZ_OK) {
return res; return res;
} }