xref: /OK3568_Linux_fs/yocto/poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From: sms
2Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb()
3Bug-Debian: http://bugs.debian.org/773722
4
5The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz
6
7Upstream-Status: Backport
8CVE: CVE-2014-8140
9
10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11
12Index: unzip60/extract.c
13===================================================================
14--- unzip60.orig/extract.c
15+++ unzip60/extract.c
16@@ -2233,10 +2233,17 @@ static int test_compr_eb(__G__ eb, eb_si
17     if (compr_offset < 4)                /* field is not compressed: */
18         return PK_OK;                    /* do nothing and signal OK */
19
20+    /* Return no/bad-data error status if any problem is found:
21+     *    1. eb_size is too small to hold the uncompressed size
22+     *       (eb_ucsize).  (Else extract eb_ucsize.)
23+     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
24+     *    3. eb_ucsize is positive, but eb_size is too small to hold
25+     *       the compressed data header.
26+     */
27     if ((eb_size < (EB_UCSIZE_P + 4)) ||
28-        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
29-         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
30-        return IZ_EF_TRUNC;               /* no compressed data! */
31+     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
32+     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
33+        return IZ_EF_TRUNC;             /* no/bad compressed data! */
34
35     method = makeword(eb + (EB_HEADSIZE + compr_offset));
36     if ((method == STORED) &&
37