summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch')
-rw-r--r--meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch b/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
new file mode 100644
index 0000000..ea93823
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
@@ -0,0 +1,38 @@
1Upstream-Status: Backport
2Signed-off-by: Tudor Florea <tudor.flore@enea.com>
3
4From 68efed87fabddd450c08f3112f62a73f61d493c9 Mon Sep 17 00:00:00 2001
5From: Petr Stodulka <pstodulk@redhat.com>
6Date: Mon, 14 Sep 2015 18:23:17 +0200
7Subject: [PATCH 1/2] upstream fix for heap overflow
8
9https://bugzilla.redhat.com/attachment.cgi?id=1073002
10---
11 crypt.c | 12 +++++++++++-
12 1 file changed, 11 insertions(+), 1 deletion(-)
13
14diff --git a/crypt.c b/crypt.c
15index 784e411..a8975f2 100644
16--- a/crypt.c
17+++ b/crypt.c
18@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd)
19 GLOBAL(pInfo->encrypted) = FALSE;
20 defer_leftover_input(__G);
21 for (n = 0; n < RAND_HEAD_LEN; n++) {
22- b = NEXTBYTE;
23+ /* 2012-11-23 SMS. (OUSPG report.)
24+ * Quit early if compressed size < HEAD_LEN. The resulting
25+ * error message ("unable to get password") could be improved,
26+ * but it's better than trying to read nonexistent data, and
27+ * then continuing with a negative G.csize. (See
28+ * fileio.c:readbyte()).
29+ */
30+ if ((b = NEXTBYTE) == (ush)EOF)
31+ {
32+ return PK_ERR;
33+ }
34 h[n] = (uch)b;
35 Trace((stdout, " (%02x)", h[n]));
36 }
37--
382.4.6