!38 fix CVE-2022-36227
From: @kerongw Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock
This commit is contained in:
commit
befa171578
38
backport-CVE-2022-36227.patch
Normal file
38
backport-CVE-2022-36227.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: obiwac <obiwac@gmail.com>
|
||||||
|
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;
|
||||||
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: libarchive
|
Name: libarchive
|
||||||
Version: 3.6.1
|
Version: 3.6.1
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Multi-format archive and compression library
|
Summary: Multi-format archive and compression library
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://www.libarchive.org/
|
URL: https://www.libarchive.org/
|
||||||
@ -14,6 +14,7 @@ BuildRequires: openssl-devel libxml2-devel lz4-devel automake libzstd-devel
|
|||||||
BuildRequires: autoconf libtool make
|
BuildRequires: autoconf libtool make
|
||||||
|
|
||||||
Patch0001: 0001-Drop-rmd160-from-OpenSSL.patch
|
Patch0001: 0001-Drop-rmd160-from-OpenSSL.patch
|
||||||
|
Patch6000: backport-CVE-2022-36227.patch
|
||||||
Patch9000: libarchive-uninitialized-value.patch
|
Patch9000: libarchive-uninitialized-value.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -188,6 +189,9 @@ run_testsuite
|
|||||||
%{_bindir}/bsdcat
|
%{_bindir}/bsdcat
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 25 2022 wangkerong <wangkerong@h-paetners.com> - 3.6.1-2
|
||||||
|
- fix CVE-2022-36227
|
||||||
|
|
||||||
* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.6.1-1
|
* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.6.1-1
|
||||||
- Upgrade to 3.6.1
|
- Upgrade to 3.6.1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user