digraph "sumprod" { rankdir="LR"; remincross=true; v0 [ label="a" ]; v1 [ label="b" ]; v2 [ label="$1_Y" ]; c4 [ shape=record, label="{{ A| B}|$1\n$add|{ Y}}" ]; v3 [ label="$1_Y" ]; v4 [ label="c" ]; v5 [ label="sum" ]; c5 [ shape=record, label="{{ A| B}|$2\n$add|{ Y}}" ]; v0:e -> c4:p1:w [color="black", style="setlinewidth(3)", label=""]; v1:e -> c4:p2:w [color="black", style="setlinewidth(3)", label=""]; c4:p3:e -> v2:w [color="black", style="setlinewidth(3)", label=""]; v3:e -> c5:p1:w [color="black", style="setlinewidth(3)", label=""]; v4:e -> c5:p2:w [color="black", style="setlinewidth(3)", label=""]; c5:p3:e -> v5:w [color="black", style="setlinewidth(3)", label=""]; }; img src='/cgit.png' alt='cgit logo'/> index : openwrt/upstream
upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-lantiq/patches/0041-lzma-fixup.patch
blob: 5b16758fa46b154723af34285f4f4e3771b1101a (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

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(-)

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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 19:12:53 +0000