From f82aa098ff434b62e21a8c6e03dd5444f46a2e3d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 09:07:45 +0000 Subject: [PATCH] import libarchive-3.5.3-4.el9 --- .../libarchive-3.5.3-Fix-CVE-2022-36227.patch | 38 +++++++++++++++++++ SPECS/libarchive.spec | 9 ++++- 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 SOURCES/libarchive-3.5.3-Fix-CVE-2022-36227.patch diff --git a/SOURCES/libarchive-3.5.3-Fix-CVE-2022-36227.patch b/SOURCES/libarchive-3.5.3-Fix-CVE-2022-36227.patch new file mode 100644 index 0000000..59b56ac --- /dev/null +++ b/SOURCES/libarchive-3.5.3-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/SPECS/libarchive.spec b/SPECS/libarchive.spec index 9638421..0d5d1d0 100644 --- a/SPECS/libarchive.spec +++ b/SPECS/libarchive.spec @@ -2,7 +2,7 @@ Name: libarchive Version: 3.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A library for handling streaming archive formats License: BSD @@ -13,7 +13,9 @@ Patch1: openssl3-rmd160failure.patch # Source: https://github.com/libarchive/libarchive/commit/cfaa28168a07ea4a53276b63068f94fce37d6aff Patch2: %{name}-3.5.3-Fix-CVE-2022-26280.patch # Source: https://github.com/libarchive/libarchive/commit/b1b501161013296d19dfe9acb84a341c8a1755b9 -Patch3: %{name}-3.5.3-Fix-size-filed-in-pax-header.patch +Patch3: %{name}-3.5.3-Fix-size-filed-in-pax-header.patch +# Source: https://github.com/libarchive/libarchive/commit/fd180c36036df7181a64931264732a10ad8cd024 +Patch4: %{name}-3.5.3-Fix-CVE-2022-36227.patch BuildRequires: automake BuildRequires: bison @@ -217,6 +219,9 @@ run_testsuite %changelog +* Wed Nov 23 2022 Lukas Javorsky - 3.5.3-4 +- Resolves: CVE-2022-36227 + * Tue Jul 12 2022 Lukas Javorsky - 3.5.3-3 - Resolves: #2106651