diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch | 42 | ||||
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive_3.6.2.bb (renamed from meta/recipes-extended/libarchive/libarchive_3.6.1.bb) | 8 |
2 files changed, 3 insertions, 47 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch deleted file mode 100644 index d0d143710c..0000000000 --- a/meta/recipes-extended/libarchive/libarchive/CVE-2022-36227.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From b5332ed6d59ba5113a0a2c67fd82b69fcd5cde68 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] libarchive: CVE-2022-36227 Handle a `calloc` returning NULL | ||
5 | (fixes #1754) | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/bff38efe8c110469c5080d387bec62a6ca15b1a5] | ||
8 | CVE: CVE-2022-36227 | ||
9 | Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com | ||
10 | --- | ||
11 | libarchive/archive_write.c | 8 ++++++++ | ||
12 | 1 file changed, 8 insertions(+) | ||
13 | |||
14 | diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c | ||
15 | index 66592e8..27626b5 100644 | ||
16 | --- a/libarchive/archive_write.c | ||
17 | +++ b/libarchive/archive_write.c | ||
18 | @@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a) | ||
19 | struct archive_write_filter *f; | ||
20 | |||
21 | f = calloc(1, sizeof(*f)); | ||
22 | + | ||
23 | + if (f == NULL) | ||
24 | + return (NULL); | ||
25 | + | ||
26 | f->archive = _a; | ||
27 | f->state = ARCHIVE_WRITE_FILTER_STATE_NEW; | ||
28 | if (a->filter_first == NULL) | ||
29 | @@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data, | ||
30 | a->client_data = client_data; | ||
31 | |||
32 | client_filter = __archive_write_allocate_filter(_a); | ||
33 | + | ||
34 | + if (client_filter == NULL) | ||
35 | + return (ARCHIVE_FATAL); | ||
36 | + | ||
37 | client_filter->open = archive_write_client_open; | ||
38 | client_filter->write = archive_write_client_write; | ||
39 | client_filter->close = archive_write_client_close; | ||
40 | -- | ||
41 | 2.25.1 | ||
42 | |||
diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb b/meta/recipes-extended/libarchive/libarchive_3.6.2.bb index df9df5e0a6..acc84de9da 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.6.2.bb | |||
@@ -30,14 +30,12 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," | |||
30 | PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," | 30 | PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls," |
31 | PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," | 31 | PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," |
32 | 32 | ||
33 | EXTRA_OECONF += "--enable-largefile" | 33 | EXTRA_OECONF += "--enable-largefile --without-iconv" |
34 | 34 | ||
35 | SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ | 35 | SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" |
36 | file://CVE-2022-36227.patch \ | ||
37 | " | ||
38 | UPSTREAM_CHECK_URI = "http://libarchive.org/" | 36 | UPSTREAM_CHECK_URI = "http://libarchive.org/" |
39 | 37 | ||
40 | SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2" | 38 | SRC_URI[sha256sum] = "ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3" |
41 | 39 | ||
42 | inherit autotools update-alternatives pkgconfig | 40 | inherit autotools update-alternatives pkgconfig |
43 | 41 | ||