libarchive: fix CVE-2022-36227

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>

diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
index 0226889cd76427f8bb4bc38f41eb099da8750bd8..9ccdedbd07ad82fb3d863588c4b07d9b6778d33b 100644 (file)
--- a/libs/libarchive/Makefile
+++ b/libs/libarchive/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libarchive
 PKG_VERSION:=3.5.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libarchive.org/downloads

diff --git a/libs/libarchive/patches/CVE-2022-36227.patch b/libs/libarchive/patches/CVE-2022-36227.patch
new file mode 100644 (file)
index 0000000..24f2c63
--- /dev/null
+++ b/libs/libarchive/patches/CVE-2022-36227.patch
@@ -0,0 +1,33 @@
+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(+)
+
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -211,6 +211,10 @@ __archive_write_allocate_filter(struct 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)
+@@ -558,6 +562,10 @@ archive_write_open2(struct archive *_a,
+       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;