From 13010f3adcf566233a6e759e946d572daba9b010 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 16 Apr 2014 12:11:24 +0000 Subject: [PATCH] lantiq: remove uboot lzma patch, apparently its not needed after all Signed-off-by: John Crispin SVN-Revision: 40521 --- .../patches/0041-lzam-fixup.patch | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 package/boot/uboot-lantiq/patches/0041-lzam-fixup.patch diff --git a/package/boot/uboot-lantiq/patches/0041-lzam-fixup.patch b/package/boot/uboot-lantiq/patches/0041-lzam-fixup.patch deleted file mode 100644 index 5b16758fa4..0000000000 --- a/package/boot/uboot-lantiq/patches/0041-lzam-fixup.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Antonios Vamporakis -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 -CC: Kees Cook -CC: Simon Glass -CC: Daniel Schwierzeck -CC: Luka Perkov ---- - lib/lzma/LzmaTools.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -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; - } --- -1.8.3.2 - -- 2.25.1