summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhixiong Chi <zhixiong.chi@windriver.com>2017-09-28 16:06:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-07 23:20:39 +0100
commitcbf796a8266598c27a3af77fcef577ba5e10297f (patch)
treee240dbe822feab3dbe78cac516c8fe168a505205
parent31fb57d72deca73aaf66dd6416defb70fe97ee24 (diff)
downloadpoky-cbf796a8266598c27a3af77fcef577ba5e10297f.tar.gz
libarchive: CVE-2017-14502
read_header in archive_read_support_format_rar.c suffers from an off-by-one error for UTF-16 names in RAR archives, leading to an out-of-bounds read in archive_read_format_rar_read_header. Backport the patch from https://github.com/libarchive/libarchive/commit commit 5562545b5562f6d12a4ef991fae158bf4ccf92b6 CVE: CVE-2017-14502 (From OE-Core rev: 0bedb69abff85cc07ad4a54eed41d15d0a38c080) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch37
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.3.2.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch
new file mode 100644
index 0000000000..72e1546435
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch
@@ -0,0 +1,37 @@
1From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
2From: Joerg Sonnenberger <joerg@bec.de>
3Date: Sat, 9 Sep 2017 17:47:32 +0200
4Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
5 archives.
6
7Reported-By: OSS-Fuzz issue 573
8
9CVE: CVE-2017-14502
10
11Upstream-Status: Backport
12
13Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
14---
15 libarchive/archive_read_support_format_rar.c | 6 +++++-
16 1 file changed, 5 insertions(+), 1 deletion(-)
17
18diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
19index cbb14c3..751de69 100644
20--- a/libarchive/archive_read_support_format_rar.c
21+++ b/libarchive/archive_read_support_format_rar.c
22@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
23 return (ARCHIVE_FATAL);
24 }
25 filename[filename_size++] = '\0';
26- filename[filename_size++] = '\0';
27+ /*
28+ * Do not increment filename_size here as the computations below
29+ * add the space for the terminating NUL explicitly.
30+ */
31+ filename[filename_size] = '\0';
32
33 /* Decoded unicode form is UTF-16BE, so we have to update a string
34 * conversion object for it. */
35--
361.9.1
37
diff --git a/meta/recipes-extended/libarchive/libarchive_3.3.2.bb b/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
index 9e4588fe77..edc4d6a152 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
@@ -34,6 +34,7 @@ EXTRA_OECONF += "--enable-largefile"
34SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ 34SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
35 file://bug929.patch \ 35 file://bug929.patch \
36 file://CVE-2017-14166.patch \ 36 file://CVE-2017-14166.patch \
37 file://CVE-2017-14502.patch \
37 " 38 "
38 39
39SRC_URI[md5sum] = "4583bd6b2ebf7e0e8963d90879eb1b27" 40SRC_URI[md5sum] = "4583bd6b2ebf7e0e8963d90879eb1b27"