From: sms
|
Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb()
|
Bug-Debian: http://bugs.debian.org/773722
|
|
The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz
|
|
Upstream-Status: Backport
|
CVE: CVE-2014-8140
|
|
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
|
Index: unzip60/extract.c
|
===================================================================
|
--- unzip60.orig/extract.c
|
+++ unzip60/extract.c
|
@@ -2233,10 +2233,17 @@ static int test_compr_eb(__G__ eb, eb_si
|
if (compr_offset < 4) /* field is not compressed: */
|
return PK_OK; /* do nothing and signal OK */
|
|
+ /* Return no/bad-data error status if any problem is found:
|
+ * 1. eb_size is too small to hold the uncompressed size
|
+ * (eb_ucsize). (Else extract eb_ucsize.)
|
+ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS.
|
+ * 3. eb_ucsize is positive, but eb_size is too small to hold
|
+ * the compressed data header.
|
+ */
|
if ((eb_size < (EB_UCSIZE_P + 4)) ||
|
- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
|
- eb_size <= (compr_offset + EB_CMPRHEADLEN)))
|
- return IZ_EF_TRUNC; /* no compressed data! */
|
+ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
|
+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
|
+ return IZ_EF_TRUNC; /* no/bad compressed data! */
|
|
method = makeword(eb + (EB_HEADSIZE + compr_offset));
|
if ((method == STORED) &&
|
