libarchive: fix CVE-2022-36227

Import patch applied to libarchive after the 3.6.1 release.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch b/meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch
new file mode 100644 (file)
index 0000000..4d13bf6
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch
@@ -0,0 +1,48 @@
+From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
+From: obiwac <obiwac@gmail.com>
+Date: Fri, 22 Jul 2022 22:41:10 +0200
+Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
+
+---
+ libarchive/archive_write.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+---
+CVE: CVE-2022-36227
+
+Source-Repo: https://github.com/libarchive/libarchive.git
+
+Upstream-Status: Backport [bff38efe8c... unmodified]
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+
+---
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index 66592e82..27626b54 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
+       struct archive_write_filter *f;
+ 
+       f = calloc(1, sizeof(*f));
++
++      if (f == NULL)
++              return (NULL);
++
+       f->archive = _a;
+       f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
+       if (a->filter_first == NULL)
+@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
+       a->client_data = client_data;
+ 
+       client_filter = __archive_write_allocate_filter(_a);
++
++      if (client_filter == NULL)
++              return (ARCHIVE_FATAL);
++
+       client_filter->open = archive_write_client_open;
+       client_filter->write = archive_write_client_write;
+       client_filter->close = archive_write_client_close;
+-- 
+2.38.1
+

diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb b/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
index 24d7918bf9d0444f95d457d27be075f1f735ae9d..c812038352ed9968ede922696ed2d70df4b82e29 100644 (file)
--- a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
@@ -34,6 +34,7 @@ EXTRA_OECONF += "--enable-largefile"
 
 SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
            file://0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch \
+           file://cve-2022-36227.patch \
            "
 UPSTREAM_CHECK_URI = "http://libarchive.org/"