On 15/04/14 00:38, Luka Perkov wrote:
On Sun, Apr 13, 2014 at 09:43:22AM +0200, John Crispin wrote:
On 27/10/2013 21:36, Daniel Schwierzeck wrote:
Patches created from tree:
g...@github.com:danielschwierzeck/u-boot-lantiq.git
v2013.10..u-boot-lantiq-v2013.10-openwrt4

Signed-off-by: Daniel Schwierzeck <daniel.schwierz...@gmail.com>

i noticed after adding that patch that tehre is a 2014.01 branch.

i will bump the package to that branch during the week

I have not tested the 2014.01 branch recently but the 2013.10 series did
not boot default OpenWrt images. Antonios made a patch that fixed it and
it is now upstreamed in u-boot.

Luka
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


the LZMA problem? Yes, see attachment. It has been applied upstream.

Antonios
>From 5c540b8b9ea159e942438c0a2322ad35f175774c Mon Sep 17 00:00:00 2001
From: Antonios Vamporakis <a...@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 <a...@area128.com>
CC: Kees Cook <keesc...@chromium.org>
CC: Simon Glass <s...@chromium.org>
CC: Daniel Schwierzeck <daniel.schwierz...@gmail.com>
CC: Luka Perkov <l...@openwrt.org>
---
 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

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to