From ff616e95b41b848543de12ea9e8f2a88a0dde75e Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Fri, 2 Dec 2022 10:01:49 +0000 Subject: [PATCH] Fix for CVE-2022-36227 Source: https://github.com/libarchive/libarchive/commit/fd180c36036df7181a64931264732a10ad8cd024 Resolves: CVE-2022-36227 --- libarchive-3.6.1-Fix-CVE-2022-36227.patch | 38 +++++++++++++++++++++++ libarchive.spec | 8 ++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 libarchive-3.6.1-Fix-CVE-2022-36227.patch diff --git a/libarchive-3.6.1-Fix-CVE-2022-36227.patch b/libarchive-3.6.1-Fix-CVE-2022-36227.patch new file mode 100644 index 0000000..59b56ac --- /dev/null +++ b/libarchive-3.6.1-Fix-CVE-2022-36227.patch @@ -0,0 +1,38 @@ +From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001 +From: obiwac +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(+) + +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.37.3 + diff --git a/libarchive.spec b/libarchive.spec index 45eeff3..17a9439 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -2,7 +2,7 @@ Name: libarchive Version: 3.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A library for handling streaming archive formats License: BSD @@ -38,6 +38,9 @@ BuildRequires: make # support explicitly. Patch0001: 0001-Drop-rmd160-from-OpenSSL.patch +# Source: https://github.com/libarchive/libarchive/commit/fd180c36036df7181a64931264732a10ad8cd024 +Patch2: %{name}-3.6.1-Fix-CVE-2022-36227.patch + %description Libarchive is a programming library that can create and read several different @@ -222,6 +225,9 @@ run_testsuite %changelog +* Fri Dec 02 2022 Lukas Javorsky - 3.6.1-3 +- Resolves: CVE-2022-36227 + * Thu Jul 21 2022 Fedora Release Engineering - 3.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild