summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonios Vamporakis <ant@area128.com>2013-12-31 02:57:01 +0100
committerTom Rini <trini@ti.com>2014-01-14 09:01:05 -0500
commit4d3b8a0d1b8665c190d502744e753ba05a047810 (patch)
tree5d10a711dd745bb2d038d90db1606225ce2fba80
parentcddb6b8304bfbc34f43920051256de7fe6c4c0ab (diff)
downloadu-boot-imx-4d3b8a0d1b8665c190d502744e753ba05a047810.zip
u-boot-imx-4d3b8a0d1b8665c190d502744e753ba05a047810.tar.gz
u-boot-imx-4d3b8a0d1b8665c190d502744e753ba05a047810.tar.bz2
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>
-rw-r--r--lib/lzma/LzmaTools.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c
index 0aec2f9..90d31cd 100644
--- a/lib/lzma/LzmaTools.c
+++ b/lib/lzma/LzmaTools.c
@@ -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;
}