MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

libarchive: fix CVE-2022-36227

Browse Source 
Import patch applied to libarchive after the 3.6.1 release.

(From OE-Core rev: c5b4d3f621bc790c8b6a6a41c73bb2efad5fab5d)

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joe Slater 2022-12-06 11:49:06 -08:00 committed by Richard Purdie
parent d9b5b8cb21
commit b85e19d17b
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch Normal file
View File

@ -0,0 +1,48 @@
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)
---
libarchive/archive_write.c | 8 ++++++++
1 file changed, 8 insertions(+)
---
CVE: CVE-2022-36227
Source-Repo: https://github.com/libarchive/libarchive.git
Upstream-Status: Backport [bff38efe8c... unmodified]
Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
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.38.1

1
meta/recipes-extended/libarchive/libarchive_3.6.1.bb
View File

@ -34,6 +34,7 @@ EXTRA_OECONF += "--enable-largefile"
SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
file://0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch \
file://cve-2022-36227.patch \
"
UPSTREAM_CHECK_URI = "http://libarchive.org/"