diff options
author | Hitendra Prajapati <hprajapati@mvista.com> | 2022-12-08 12:56:27 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-23 23:05:44 +0000 |
commit | 3ff484966d0b2cde97fd53852df689d7cf1f8f3a (patch) | |
tree | 30453853dab8bc868d4b126e2c90d17f5621a185 | |
parent | b4fc8a65f51796154fb9eba9eb05dc068fe0673b (diff) | |
download | poky-3ff484966d0b2cde97fd53852df689d7cf1f8f3a.tar.gz |
libarchive: CVE-2022-36227 NULL pointer dereference in archive_write.c
Upstream-Status: Backport from https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5
(From OE-Core rev: c39fd8264ac623f3cfb26305420b527dd9c4c891)
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch | 43 | ||||
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive_3.4.2.bb | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch new file mode 100644 index 0000000000..980a0e884a --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 6311080bff566fcc5591dadfd78efb41705b717f Mon Sep 17 00:00:00 2001 | ||
2 | From: obiwac <obiwac@gmail.com> | ||
3 | Date: Fri, 22 Jul 2022 22:41:10 +0200 | ||
4 | Subject: [PATCH] CVE-2022-36227 | ||
5 | |||
6 | libarchive: CVE-2022-36227 Handle a `calloc` returning NULL (fixes #1754) | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] | ||
9 | CVE: CVE-2022-36227 | ||
10 | Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com | ||
11 | --- | ||
12 | libarchive/archive_write.c | 8 ++++++++ | ||
13 | 1 file changed, 8 insertions(+) | ||
14 | |||
15 | diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c | ||
16 | index 98a55fb..7fe88b6 100644 | ||
17 | --- a/libarchive/archive_write.c | ||
18 | +++ b/libarchive/archive_write.c | ||
19 | @@ -211,6 +211,10 @@ __archive_write_allocate_filter(struct archive *_a) | ||
20 | struct archive_write_filter *f; | ||
21 | |||
22 | f = calloc(1, sizeof(*f)); | ||
23 | + | ||
24 | + if (f == NULL) | ||
25 | + return (NULL); | ||
26 | + | ||
27 | f->archive = _a; | ||
28 | f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; | ||
29 | if (a->filter_first == NULL) | ||
30 | @@ -527,6 +531,10 @@ archive_write_open(struct archive *_a, void *client_data, | ||
31 | a->client_data = client_data; | ||
32 | |||
33 | client_filter = __archive_write_allocate_filter(_a); | ||
34 | + | ||
35 | + if (client_filter == NULL) | ||
36 | + return (ARCHIVE_FATAL); | ||
37 | + | ||
38 | client_filter->open = archive_write_client_open; | ||
39 | client_filter->write = archive_write_client_write; | ||
40 | client_filter->close = archive_write_client_close; | ||
41 | -- | ||
42 | 2.25.1 | ||
43 | |||
diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb index 7d2e7b711b..e0a6174d8b 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.2.bb | |||
@@ -39,6 +39,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ | |||
39 | file://CVE-2021-23177.patch \ | 39 | file://CVE-2021-23177.patch \ |
40 | file://CVE-2021-31566-01.patch \ | 40 | file://CVE-2021-31566-01.patch \ |
41 | file://CVE-2021-31566-02.patch \ | 41 | file://CVE-2021-31566-02.patch \ |
42 | file://CVE-2022-36227.patch \ | ||
42 | " | 43 | " |
43 | 44 | ||
44 | SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" | 45 | SRC_URI[md5sum] = "d953ed6b47694dadf0e6042f8f9ff451" |