diff options
author | Armin Kuster <akuster@mvista.com> | 2016-01-30 14:12:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 23:20:15 +0000 |
commit | 55aafb547de2ba110bfc897cf7f3a6b18cb29880 (patch) | |
tree | e291ffd7e04980470f81e156871b6e8e7e396b33 /meta/recipes-devtools/dpkg | |
parent | 029948bc8e558865b31cdabdb3281e66b081fb92 (diff) | |
download | poky-55aafb547de2ba110bfc897cf7f3a6b18cb29880.tar.gz |
dpkg: Security fix CVE-2015-0860
CVE-2015-0860 dpkg: stack overflows and out of bounds read
(From OE-Core rev: 5aaec01acc9e5a19374a566307a425d43c887f4b)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dpkg')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch | 52 | ||||
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg_1.18.2.bb | 1 |
2 files changed, 53 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..1f259d34db --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/CVE-2015-0860.patch | |||
@@ -0,0 +1,52 @@ | |||
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.18.2/dpkg-deb/extract.c | ||
28 | =================================================================== | ||
29 | --- dpkg-1.18.2.orig/dpkg-deb/extract.c | ||
30 | +++ dpkg-1.18.2/dpkg-deb/extract.c | ||
31 | @@ -247,7 +247,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.18.2/ChangeLog | ||
41 | =================================================================== | ||
42 | --- dpkg-1.18.2.orig/ChangeLog | ||
43 | +++ dpkg-1.18.2/ChangeLog | ||
44 | @@ -1,3 +1,8 @@ | ||
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 | commit 5459d330c73cdcfd1327bc93c0ebddc2da4a3a3a (HEAD -> master, tag: 1.18.2) | ||
51 | Author: Guillem Jover <guillem@debian.org> | ||
52 | Date: Mon Aug 3 15:41:05 2015 +0200 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb index 4c3fa4f395..2fc096db48 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb | |||
@@ -12,6 +12,7 @@ SRC_URI += "file://noman.patch \ | |||
12 | file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ | 12 | file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ |
13 | file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ | 13 | file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ |
14 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ | 14 | file://0005-dpkg-compiler.m4-remove-Wvla.patch \ |
15 | file://CVE-2015-0860.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576" | 18 | SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576" |