libarchive: CVE-2017-14501

iso9660: validate directory record length

Affects libarchive <= 3.3.2

(From OE-Core rev: dea4280623f945c06e8132c888988373e686318e)

(From OE-Core rev: ab1bfa1872d44ea7fff096df781521143a907545)

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 80 insertions, 0 deletions

diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2017-14501.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2017-14501.patch
new file mode 100644
index 0000000000..1038102e6b
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/CVE-2017-14501.patch
@@ -0,0 +1,79 @@
+From f9569c086ff29259c73790db9cbf39fe8fb9d862 Mon Sep 17 00:00:00 2001
+From: John Starks <jostarks@microsoft.com>
+Date: Wed, 25 Jul 2018 12:16:34 -0700
+Subject: [PATCH] iso9660: validate directory record length
+
+CVE: CVE-2017-14501
+Upstream-Status: Backport [https://github.com/mmatuska/libarchive/commit/13e87dcd9c37b533127cceb9f3e1e5a38d95e784]
+
+Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
+---
+ libarchive/archive_read_support_format_iso9660.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index f01d37bf..089bb723 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -409,7 +409,8 @@ static int  next_entry_seek(struct archive_read *, struct iso9660 *,
+                    struct file_info **);
+ static struct file_info *
+                parse_file_info(struct archive_read *a,
+-                   struct file_info *parent, const unsigned char *isodirrec);
++                   struct file_info *parent, const unsigned char *isodirrec,
++                   size_t reclen);
+ static int     parse_rockridge(struct archive_read *a,
+                    struct file_info *file, const unsigned char *start,
+                    const unsigned char *end);
+@@ -1022,7 +1023,7 @@ read_children(struct archive_read *a, struct file_info *parent)
+                        if (*(p + DR_name_len_offset) == 1
+                            && *(p + DR_name_offset) == '\001')
+                                continue;
+-                       child = parse_file_info(a, parent, p);
++                       child = parse_file_info(a, parent, p, b - p);
+                        if (child == NULL) {
+                                __archive_read_consume(a, skip_size);
+                                return (ARCHIVE_FATAL);
+@@ -1112,7 +1113,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
+         */
+        seenJoliet = iso9660->seenJoliet;/* Save flag. */
+        iso9660->seenJoliet = 0;
+-       file = parse_file_info(a, NULL, block);
++       file = parse_file_info(a, NULL, block, vd->size);
+        if (file == NULL)
+                return (ARCHIVE_FATAL);
+        iso9660->seenJoliet = seenJoliet;
+@@ -1144,7 +1145,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
+                        return (ARCHIVE_FATAL);
+                }
+                iso9660->seenJoliet = 0;
+-               file = parse_file_info(a, NULL, block);
++               file = parse_file_info(a, NULL, block, vd->size);
+                if (file == NULL)
+                        return (ARCHIVE_FATAL);
+                iso9660->seenJoliet = seenJoliet;
+@@ -1749,7 +1750,7 @@ archive_read_format_iso9660_cleanup(struct archive_read *a)
+  */
+ static struct file_info *
+ parse_file_info(struct archive_read *a, struct file_info *parent,
+-    const unsigned char *isodirrec)
++    const unsigned char *isodirrec, size_t reclen)
+ {
+        struct iso9660 *iso9660;
+        struct file_info *file, *filep;
+@@ -1763,7 +1764,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ 
+        iso9660 = (struct iso9660 *)(a->format->data);
+ 
+-       dr_len = (size_t)isodirrec[DR_length_offset];
++       if (reclen == 0 || reclen < (dr_len = (size_t)isodirrec[DR_length_offset])) {
++               archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++                       "Invalid directory record length");
++               return (NULL);
++       }
+        name_len = (size_t)isodirrec[DR_name_len_offset];
+        location = archive_le32dec(isodirrec + DR_extent_offset);
+        fsize = toi(isodirrec + DR_size_offset, DR_size_size);
+-- 
+2.13.3
+
diff --git a/meta/recipes-extended/libarchive/libarchive_3.3.2.bb b/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
index 3269716473..e3d90b276a 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
@@ -37,6 +37,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
            file://CVE-2017-14502.patch \
            file://non-recursive-extract-and-list.patch \
            file://CVE-2017-14503.patch \
+           file://CVE-2017-14501.patch \
           "
 
 SRC_URI[md5sum] = "4583bd6b2ebf7e0e8963d90879eb1b27"