diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch | 53 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.17.21.bb | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch b/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch new file mode 100644 index 0000000000..2008d89a17 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From f1aac7d933819569bf6f347c3c0d5a64a90bbce0 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Hanno=20B=C3=B6ck?= <hanno@hboeck.de> | ||
3 | Date: Thu, 19 Nov 2015 20:03:10 +0100 | ||
4 | Subject: [PATCH] dpkg-deb: Fix off-by-one write access on ctrllenbuf variable | ||
5 | |||
6 | This affects old format .deb packages. | ||
7 | |||
8 | Fixes: CVE-2015-0860 | ||
9 | Warned-by: afl | ||
10 | Signed-off-by: Guillem Jover <guillem@debian.org> | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | https://anonscm.debian.org/cgit/dpkg/dpkg.git/commit/?h=wheezy&id=f1aac7d933819569bf6f347c3c0d5a64a90bbce0 | ||
15 | |||
16 | CVE: CVE-2015-0860 | ||
17 | |||
18 | hand merge Changelog | ||
19 | |||
20 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
21 | |||
22 | --- | ||
23 | debian/changelog | 3 +++ | ||
24 | dpkg-deb/extract.c | 2 +- | ||
25 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
26 | |||
27 | Index: dpkg-1.17.21/dpkg-deb/extract.c | ||
28 | =================================================================== | ||
29 | --- dpkg-1.17.21.orig/dpkg-deb/extract.c | ||
30 | +++ dpkg-1.17.21/dpkg-deb/extract.c | ||
31 | @@ -245,7 +245,7 @@ extracthalf(const char *debar, const cha | ||
32 | if (errstr) | ||
33 | ohshit(_("archive has invalid format version: %s"), errstr); | ||
34 | |||
35 | - r = read_line(arfd, ctrllenbuf, 1, sizeof(ctrllenbuf)); | ||
36 | + r = read_line(arfd, ctrllenbuf, 1, sizeof(ctrllenbuf) - 1); | ||
37 | if (r < 0) | ||
38 | read_fail(r, debar, _("archive control member size")); | ||
39 | if (sscanf(ctrllenbuf, "%jd%c%d", &ctrllennum, &nlc, &dummy) != 2 || | ||
40 | Index: dpkg-1.17.21/ChangeLog | ||
41 | =================================================================== | ||
42 | --- dpkg-1.17.21.orig/ChangeLog | ||
43 | +++ dpkg-1.17.21/ChangeLog | ||
44 | @@ -1,3 +1,9 @@ | ||
45 | +[ Guillem Jover ] | ||
46 | + * Fix an off-by-one write access in dpkg-deb when parsing the old format | ||
47 | + .deb control member size. Thanks to Hanno Böck <hanno@hboeck.de>. | ||
48 | + Fixes CVE-2015-0860. | ||
49 | + | ||
50 | + | ||
51 | commit 6fc9e281551e0d851e38249679688bbabbad5c5f | ||
52 | Author: Guillem Jover <guillem@debian.org> | ||
53 | Date: Sat Oct 25 02:24:41 2014 +0200 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.17.21.bb b/meta/recipes-devtools/dpkg/dpkg_1.17.21.bb index 7adb2b227f..9133d91a09 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.17.21.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.17.21.bb | |||
@@ -14,6 +14,7 @@ SRC_URI += "file://noman.patch \ | |||
14 | file://no-vla-warning.patch \ | 14 | file://no-vla-warning.patch \ |
15 | file://add_armeb_triplet_entry.patch \ | 15 | file://add_armeb_triplet_entry.patch \ |
16 | file://tarfix.patch \ | 16 | file://tarfix.patch \ |
17 | file://CVE-2015-0860.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "765a96fd0180196613bbfa3c4aef0775" | 20 | SRC_URI[md5sum] = "765a96fd0180196613bbfa3c4aef0775" |