1From a8ce86155076505d0d6e3d8a3e44c26bb89d9524 Mon Sep 17 00:00:00 2001
2From: "Steven M. Schweda" <sms@antinode.info>
3Date: Sat, 15 Jun 2019 18:13:11 -0700
4Subject: [PATCH] Fix CVE-2014-8140: out-of-bounds write issue in
5 test_compr_eb()
6
7---
8 extract.c | 13 ++++++++++---
9 1 file changed, 10 insertions(+), 3 deletions(-)
10
11diff --git a/extract.c b/extract.c
12index df0fa1c..ec31e60 100644
13--- a/extract.c
14+++ b/extract.c
15@@ -2232,10 +2232,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
16 if (compr_offset < 4) /* field is not compressed: */
17 return PK_OK; /* do nothing and signal OK */
18
19+ /* Return no/bad-data error status if any problem is found:
20+ * 1. eb_size is too small to hold the uncompressed size
21+ * (eb_ucsize). (Else extract eb_ucsize.)
22+ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS.
23+ * 3. eb_ucsize is positive, but eb_size is too small to hold
24+ * the compressed data header.
25+ */
26 if ((eb_size < (EB_UCSIZE_P + 4)) ||
27- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
28- eb_size <= (compr_offset + EB_CMPRHEADLEN)))
29- return IZ_EF_TRUNC; /* no compressed data! */
30+ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
31+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
32+ return IZ_EF_TRUNC; /* no/bad compressed data! */
33
34 if (
35 #ifdef INT_16BIT
36--
372.20.1
38