From e0a0e160e8ee95452caedb6b90c23c4f1c8a462e Mon Sep 17 00:00:00 2001 From: wangkerong Date: Fri, 25 Nov 2022 02:24:40 +0000 Subject: [PATCH] fix CVE-2022-36227 --- backport-CVE-2022-36227.patch | 38 +++++++++++++++++++++++++++++++++++ libarchive.spec | 6 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 backport-CVE-2022-36227.patch diff --git a/backport-CVE-2022-36227.patch b/backport-CVE-2022-36227.patch new file mode 100644 index 0000000..7306ba8 --- /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 ce039f4..48f267f 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -2,7 +2,7 @@ Name: libarchive Version: 3.5.2 -Release: 4 +Release: 5 Summary: Multi-format archive and compression library License: BSD @@ -17,6 +17,7 @@ Patch6000: backport-libarchive-3.5.2-symlink-fix.patch Patch6001: backport-CVE-2021-36976.patch Patch6002: backport-CVE-2021-31566.patch Patch6003: backport-CVE-2022-26280.patch +Patch6004: backport-CVE-2022-36227.patch Patch9000: libarchive-uninitialized-value.patch @@ -191,6 +192,9 @@ run_testsuite %{_bindir}/bsdcat %changelog +* Fri Nov 25 2022 wangkerong - 3.5.2-5 +- fix CVE-2022-36227 + * Mon Jul 04 2022 wangkerong - 3.5.2-4 - fix CVE-2022-26280 -- Gitee