mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 13:49:49 +00:00
libarchive: fix CVE-2022-26280
Backport fix from https://github.com/libarchive/libarchive/issues/1672 (From OE-Core rev: b23482f9ea1cc930a3d5ecfe5fc465e2f720a949) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
11f05ffddd
commit
51a742eab1
@@ -0,0 +1,29 @@
|
|||||||
|
From cfaa28168a07ea4a53276b63068f94fce37d6aff Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tim Kientzle <kientzle@acm.org>
|
||||||
|
Date: Thu, 24 Mar 2022 10:35:00 +0100
|
||||||
|
Subject: [PATCH] ZIP reader: fix possible out-of-bounds read in
|
||||||
|
zipx_lzma_alone_init()
|
||||||
|
|
||||||
|
Fixes #1672
|
||||||
|
|
||||||
|
CVE: CVE-2022-26280
|
||||||
|
Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/cfaa28168a07ea4a53276b63068f94fce37d6aff]
|
||||||
|
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
libarchive/archive_read_support_format_zip.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
|
||||||
|
index 38ada70b5..9d6c900b2 100644
|
||||||
|
--- a/libarchive/archive_read_support_format_zip.c
|
||||||
|
+++ b/libarchive/archive_read_support_format_zip.c
|
||||||
|
@@ -1667,7 +1667,7 @@ zipx_lzma_alone_init(struct archive_read *a, struct zip *zip)
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Read magic1,magic2,lzma_params from the ZIPX stream. */
|
||||||
|
- if((p = __archive_read_ahead(a, 9, NULL)) == NULL) {
|
||||||
|
+ if(zip->entry_bytes_remaining < 9 || (p = __archive_read_ahead(a, 9, NULL)) == NULL) {
|
||||||
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
|
||||||
|
"Truncated lzma data");
|
||||||
|
return (ARCHIVE_FATAL);
|
||||||
@@ -39,6 +39,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
|
|||||||
file://CVE-2021-23177.patch \
|
file://CVE-2021-23177.patch \
|
||||||
file://CVE-2021-31566-01.patch \
|
file://CVE-2021-31566-01.patch \
|
||||||
file://CVE-2021-31566-02.patch \
|
file://CVE-2021-31566-02.patch \
|
||||||
|
file://CVE-2022-26280.patch \
|
||||||
file://CVE-2022-36227.patch \
|
file://CVE-2022-36227.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user