diff options
author | Mathias Kresin <dev@kresin.me> | 2016-05-21 12:13:36 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2016-05-23 11:03:24 +0200 |
commit | b3795d0c93d309de9be670e3d2c86b3df479ad2c (patch) | |
tree | da9d2e74e7d5c66eec0539dc3f999713bbf04da3 /package/boot/uboot-lantiq/patches/0023-lzma-fixup.patch | |
parent | 74b1687be31f3682c411e7f0ea6c7de6cff57cb3 (diff) | |
download | upstream-b3795d0c93d309de9be670e3d2c86b3df479ad2c.tar.gz upstream-b3795d0c93d309de9be670e3d2c86b3df479ad2c.tar.bz2 upstream-b3795d0c93d309de9be670e3d2c86b3df479ad2c.zip |
uboot-lantiq: reorder and rework patches
use:
- 00nn for u-boot patches
- 01nn for new boards
While doing the rework, the board definitions for the easy50712 and
easy80920 were moved to distinct board definitions patches.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/boot/uboot-lantiq/patches/0023-lzma-fixup.patch')
-rw-r--r-- | package/boot/uboot-lantiq/patches/0023-lzma-fixup.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/package/boot/uboot-lantiq/patches/0023-lzma-fixup.patch b/package/boot/uboot-lantiq/patches/0023-lzma-fixup.patch new file mode 100644 index 0000000000..7c15938330 --- /dev/null +++ b/package/boot/uboot-lantiq/patches/0023-lzma-fixup.patch @@ -0,0 +1,39 @@ +From: Antonios Vamporakis <ant@area128.com> +Date: Tue, 31 Dec 2013 01:05:42 +0100 +Subject: [PATCH] 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> +--- + lib/lzma/LzmaTools.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/lib/lzma/LzmaTools.c ++++ b/lib/lzma/LzmaTools.c +@@ -102,7 +102,7 @@ int lzmaBuffToBuffDecompress (unsigned c + return SZ_ERROR_OUTPUT_EOF; + + /* Decompress */ +- outProcessed = *uncompressedSize; ++ outProcessed = outSizeFull; + + WATCHDOG_RESET(); + +@@ -111,6 +111,9 @@ int lzmaBuffToBuffDecompress (unsigned c + 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; + } |