diff --git a/backport-CVE-2022-36227.patch b/backport-CVE-2022-36227.patch new file mode 100644 index 0000000000000000000000000000000000000000..7306ba811dd3505c57c5329cce67725d6371c64c --- /dev/null +++ b/backport-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) + +Conflict:NA +Reference:https://github.com/libarchive/libarchive/commit/fd180c36036df7181a64931264732a10ad8cd024 +--- + libarchive/archive_write.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c +index 66592e826..27626b541 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; + diff --git a/libarchive.spec b/libarchive.spec index ea36f8f3e11537883b308a66c942112e053a8d01..f3f8c065f18b6f2d01a40ce5576034f8988fc3ef 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -2,7 +2,7 @@ Name: libarchive Version: 3.4.3 -Release: 5 +Release: 6 Summary: Multi-format archive and compression library License: BSD @@ -27,6 +27,7 @@ Patch6007: backport-0002-CVE-2021-31566.patch Patch6008: backport-0003-CVE-2021-31566.patch Patch6009: backport-0004-CVE-2021-31566.patch Patch6010: backport-CVE-2022-26280.patch +Patch6011: backport-CVE-2022-36227.patch %description %{name} is an open-source BSD-licensed C programming library that @@ -158,6 +159,9 @@ run_testsuite %{_mandir}/man5/* %changelog +* Fri Nov 25 2022 wangkeorng - 3.4.3-6 +- fix CVE-2022-36227 + * Mon Jul 04 2022 wangkeorng - 3.4.3-5 - fix CVE-2022-26280