From fe623595a3d1786c107a873feb0aca96c826dcf7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 08:42:39 +0000 Subject: [PATCH] import libarchive-3.3.3-5.el8 --- .../libarchive-3.3.3-Fix-CVE-2022-36227.patch | 38 +++++++++++++++++++ SPECS/libarchive.spec | 7 +++- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 SOURCES/libarchive-3.3.3-Fix-CVE-2022-36227.patch diff --git a/SOURCES/libarchive-3.3.3-Fix-CVE-2022-36227.patch b/SOURCES/libarchive-3.3.3-Fix-CVE-2022-36227.patch new file mode 100644 index 0000000..ce5aef4 --- /dev/null +++ b/SOURCES/libarchive-3.3.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 +@@ -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; + if (a->filter_first == NULL) + a->filter_first = f; +@@ -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 9afc7b1..536eef7 100644 --- a/SPECS/libarchive.spec +++ b/SPECS/libarchive.spec @@ -2,7 +2,7 @@ Name: libarchive Version: 3.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library for handling streaming archive formats License: BSD @@ -24,7 +24,7 @@ Patch10: libarchive-3.3.3-CVE-2021-23177.patch Patch11: libarchive-3.3.3-CVE-2021-31566.patch # Source: https://github.com/libarchive/libarchive/commit/b1b501161013296d19dfe9acb84a341c8a1755b9 Patch12: %{name}-3.3.3-Fix-size-filed-in-pax-header.patch - +Patch13: %{name}-3.3.3-Fix-CVE-2022-36227.patch BuildRequires: gcc @@ -232,6 +232,9 @@ run_testsuite %changelog +* Tue Dec 06 2022 Lukas Javorsky - 3.3.3-5 +- Fix for CVE-2022-36227 + * Tue Jul 12 2022 Lukas Javorsky - 3.3.3-4 - Resolves: #2037839