summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2025-11-22 23:16:53 +0100
committerSteve Sakoman <steve@sakoman.com>2025-12-01 07:34:55 -0800
commit842fd60ebb87c607b9a7a4db77d4e9fb8a123bea (patch)
treefdd0d4961999eed881935de238ed07cf2d3c13f6
parent03c1257cfda5f09cf3dd31b80fe1e00031dff4e5 (diff)
downloadpoky-842fd60ebb87c607b9a7a4db77d4e9fb8a123bea.tar.gz
libarchive: patch 3.8.3 security issue 2
Pick patch [2] as listed in [1]. [1] https://github.com/libarchive/libarchive/releases/tag/v3.8.3 [2] https://github.com/libarchive/libarchive/pull/2768 (From OE-Core rev: efe032eef7034009f1202985b2036fc79e06bddf) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-extended/libarchive/libarchive/0001-Merge-pull-request-2768-from-Commandoss-master.patch28
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.7.9.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/0001-Merge-pull-request-2768-from-Commandoss-master.patch b/meta/recipes-extended/libarchive/libarchive/0001-Merge-pull-request-2768-from-Commandoss-master.patch
new file mode 100644
index 0000000000..66e88c91b4
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/0001-Merge-pull-request-2768-from-Commandoss-master.patch
@@ -0,0 +1,28 @@
1From 82b57a9740aa6d084edcf4592a3b8e49f63dec98 Mon Sep 17 00:00:00 2001
2From: Tim Kientzle <kientzle@acm.org>
3Date: Fri, 31 Oct 2025 22:07:19 -0700
4Subject: [PATCH] Merge pull request #2768 from Commandoss/master
5
6Fix for an out-of-bounds buffer overrun when using p[H_LEVEL_OFFSET]
7
8(cherry picked from commit ce614c65246158bcb0dc1f9c1dce5a5af65f9827)
9
10Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/82b57a9740aa6d084edcf4592a3b8e49f63dec98]
11Signed-off-by: Peter Marko <peter.marko@siemens.com>
12---
13 libarchive/archive_read_support_format_lha.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
17index 2a84ad9d..abf8b879 100644
18--- a/libarchive/archive_read_support_format_lha.c
19+++ b/libarchive/archive_read_support_format_lha.c
20@@ -690,7 +690,7 @@ archive_read_format_lha_read_header(struct archive_read *a,
21 * a pathname and a symlink has '\' character, a directory
22 * separator in DOS/Windows. So we should convert it to '/'.
23 */
24- if (p[H_LEVEL_OFFSET] == 0)
25+ if (lha->level == 0)
26 lha_replace_path_separator(lha, entry);
27
28 archive_entry_set_mode(entry, lha->mode);
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.9.bb b/meta/recipes-extended/libarchive/libarchive_3.7.9.bb
index 88e9fbf8e9..da11e052a7 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.7.9.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.7.9.bb
@@ -41,6 +41,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
41 file://0001-Merge-pull-request-2696-from-al3xtjames-mkstemp.patch \ 41 file://0001-Merge-pull-request-2696-from-al3xtjames-mkstemp.patch \
42 file://0001-Merge-pull-request-2749-from-KlaraSystems-des-tempdi.patch \ 42 file://0001-Merge-pull-request-2749-from-KlaraSystems-des-tempdi.patch \
43 file://0001-Merge-pull-request-2753-from-KlaraSystems-des-temp-f.patch \ 43 file://0001-Merge-pull-request-2753-from-KlaraSystems-des-temp-f.patch \
44 file://0001-Merge-pull-request-2768-from-Commandoss-master.patch \
44 " 45 "
45UPSTREAM_CHECK_URI = "http://libarchive.org/" 46UPSTREAM_CHECK_URI = "http://libarchive.org/"
46 47