summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:45:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:51 -0800
commita6ca00f2afe8859f44a3af613a1da9b6336c161e (patch)
tree9b476b362665ed444570241467f6c5bb3673c0b8
parentd8de33b0c2a943b01e68b5c5f8148651f597b90b (diff)
downloadpoky-a6ca00f2afe8859f44a3af613a1da9b6336c161e.tar.gz
unzip: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: b45ce6dbbd459ecc96eae76b5695927dbda1dbb4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
index c989df1896..ca4aaadffe 100644
--- a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
+++ b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
@@ -9,9 +9,11 @@ CVE: CVE-2014-8140
9 9
10Signed-off-by: Roy Li <rongqing.li@windriver.com> 10Signed-off-by: Roy Li <rongqing.li@windriver.com>
11 11
12--- a/extract.c 12Index: unzip60/extract.c
13+++ b/extract.c 13===================================================================
14@@ -2232,10 +2232,17 @@ 14--- unzip60.orig/extract.c
15+++ unzip60/extract.c
16@@ -2233,10 +2233,17 @@ static int test_compr_eb(__G__ eb, eb_si
15 if (compr_offset < 4) /* field is not compressed: */ 17 if (compr_offset < 4) /* field is not compressed: */
16 return PK_OK; /* do nothing and signal OK */ 18 return PK_OK; /* do nothing and signal OK */
17 19
@@ -30,5 +32,5 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
30+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) 32+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
31+ return IZ_EF_TRUNC; /* no/bad compressed data! */ 33+ return IZ_EF_TRUNC; /* no/bad compressed data! */
32 34
33 if ( 35 method = makeword(eb + (EB_HEADSIZE + compr_offset));
34 #ifdef INT_16BIT 36 if ((method == STORED) &&