diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox/CVE-2017-15874.patch | 30 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.27.2.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/CVE-2017-15874.patch b/meta/recipes-core/busybox/busybox/CVE-2017-15874.patch new file mode 100644 index 0000000000..67b4ed7e11 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2017-15874.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From e75c01bb3249df16201b482b79bb24bec3b58188 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Vlasenko <vda.linux@googlemail.com> | ||
3 | Date: Fri, 27 Oct 2017 15:37:03 +0200 | ||
4 | Subject: [PATCH] unlzma: fix SEGV, closes 10436 | ||
5 | |||
6 | Upstream-Status: Backport [ https://git.busybox.net/busybox/commit/?id=9ac42c500586fa5f10a1f6d22c3f797df11b1f6b] | ||
7 | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | ||
8 | Signed-off-by: Sinan Kaya <okaya@kernel.org> | ||
9 | --- | ||
10 | archival/libarchive/decompress_unlzma.c | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c | ||
14 | index 29eee2a..41e492f 100644 | ||
15 | --- a/archival/libarchive/decompress_unlzma.c | ||
16 | +++ b/archival/libarchive/decompress_unlzma.c | ||
17 | @@ -353,6 +353,10 @@ unpack_lzma_stream(transformer_state_t *xstate) | ||
18 | pos = buffer_pos - rep0; | ||
19 | if ((int32_t)pos < 0) { | ||
20 | pos += header.dict_size; | ||
21 | + /* bug 10436 has an example file where this triggers: */ | ||
22 | + if ((int32_t)pos < 0) | ||
23 | + goto bad; | ||
24 | + | ||
25 | /* see unzip_bad_lzma_2.zip: */ | ||
26 | if (pos >= buffer_size) | ||
27 | goto bad; | ||
28 | -- | ||
29 | 2.19.0 | ||
30 | |||
diff --git a/meta/recipes-core/busybox/busybox_1.27.2.bb b/meta/recipes-core/busybox/busybox_1.27.2.bb index 1ce4823d47..bab29728ee 100644 --- a/meta/recipes-core/busybox/busybox_1.27.2.bb +++ b/meta/recipes-core/busybox/busybox_1.27.2.bb | |||
@@ -47,6 +47,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
47 | file://busybox-CVE-2017-16544.patch \ | 47 | file://busybox-CVE-2017-16544.patch \ |
48 | file://busybox-fix-lzma-segfaults.patch \ | 48 | file://busybox-fix-lzma-segfaults.patch \ |
49 | file://umount-ignore-c.patch \ | 49 | file://umount-ignore-c.patch \ |
50 | file://CVE-2017-15874.patch \ | ||
50 | " | 51 | " |
51 | SRC_URI_append_libc-musl = " file://musl.cfg " | 52 | SRC_URI_append_libc-musl = " file://musl.cfg " |
52 | 53 | ||