mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-15 19:51:37 +00:00
lzma: fix buffer bound check error
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:
parent
cddb6b8304
commit
4d3b8a0d1b
1 changed files with 4 additions and 1 deletions
|
@ -102,7 +102,7 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
|
|||
return SZ_ERROR_OUTPUT_EOF;
|
||||
|
||||
/* Decompress */
|
||||
outProcessed = *uncompressedSize;
|
||||
outProcessed = outSizeFull;
|
||||
|
||||
WATCHDOG_RESET();
|
||||
|
||||
|
@ -111,6 +111,9 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
|
|||
inStream + LZMA_DATA_OFFSET, &compressedSize,
|
||||
inStream, LZMA_PROPS_SIZE, LZMA_FINISH_END, &state, &g_Alloc);
|
||||
*uncompressedSize = outProcessed;
|
||||
|
||||
debug("LZMA: Uncompresed ................ 0x%zx\n", outProcessed);
|
||||
|
||||
if (res != SZ_OK) {
|
||||
return res;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue