Drop backported patch Signed-off-by: Richard Purdie <[email protected]> --- ...buffer-overflow-in-lzma_index_append.patch | 66 ------------------- .../xz/{xz_5.8.2.bb => xz_5.8.3.bb} | 5 +- 2 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-extended/xz/xz/0001-liblzma-Fix-a-buffer-overflow-in-lzma_index_append.patch rename meta/recipes-extended/xz/{xz_5.8.2.bb => xz_5.8.3.bb} (94%)
diff --git a/meta/recipes-extended/xz/xz/0001-liblzma-Fix-a-buffer-overflow-in-lzma_index_append.patch b/meta/recipes-extended/xz/xz/0001-liblzma-Fix-a-buffer-overflow-in-lzma_index_append.patch deleted file mode 100644 index d3918233eab..00000000000 --- a/meta/recipes-extended/xz/xz/0001-liblzma-Fix-a-buffer-overflow-in-lzma_index_append.patch +++ /dev/null @@ -1,66 +0,0 @@ -From c8c22869e780ff57c96b46939c3d79ff99395f87 Mon Sep 17 00:00:00 2001 -From: Lasse Collin <[email protected]> -Date: Sun, 29 Mar 2026 19:11:21 +0300 -Subject: [PATCH] liblzma: Fix a buffer overflow in lzma_index_append() - -If lzma_index_decoder() was used to decode an Index that contained no -Records, the resulting lzma_index had an invalid internal "prealloc" -value. If lzma_index_append() was called on this lzma_index, too -little memory would be allocated and a buffer overflow would occur. - -While this combination of the API functions is meant to work, in the -real-world apps this call sequence is rare or might not exist at all. - -This bug is older than xz 5.0.0, so all stable releases are affected. - -Reported-by: GitHub user christos-spearbit - -CVE: CVE-2026-34743 -Upstream-Status: Backport [https://github.com/tukaani-project/xz/commit/c8c22869e780ff57c96b46939c3d79ff99395f87] -Signed-off-by: Ross Burton <[email protected]> ---- - src/liblzma/common/index.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/src/liblzma/common/index.c b/src/liblzma/common/index.c -index 6add6a68..c4aadb9b 100644 ---- a/src/liblzma/common/index.c -+++ b/src/liblzma/common/index.c -@@ -433,6 +433,26 @@ lzma_index_prealloc(lzma_index *i, lzma_vli records) - if (records > PREALLOC_MAX) - records = PREALLOC_MAX; - -+ // If index_decoder.c calls us with records == 0, it's decoding -+ // an Index that has no Records. In that case the decoder won't call -+ // lzma_index_append() at all, and i->prealloc isn't used during -+ // the Index decoding either. -+ // -+ // Normally the first lzma_index_append() call from the Index decoder -+ // would reset i->prealloc to INDEX_GROUP_SIZE. With no Records, -+ // lzma_index_append() isn't called and the resetting of prealloc -+ // won't occur either. Thus, if records == 0, use the default value -+ // INDEX_GROUP_SIZE instead. -+ // -+ // NOTE: lzma_index_append() assumes i->prealloc > 0. liblzma <= 5.8.2 -+ // didn't have this check and could set i->prealloc = 0, which would -+ // result in a buffer overflow if the application called -+ // lzma_index_append() after decoding an empty Index. Appending -+ // Records after decoding an Index is a rare thing to do, but -+ // it is supposed to work. -+ if (records == 0) -+ records = INDEX_GROUP_SIZE; -+ - i->prealloc = (size_t)(records); - return; - } -@@ -685,6 +705,7 @@ lzma_index_append(lzma_index *i, const lzma_allocator *allocator, - ++g->last; - } else { - // We need to allocate a new group. -+ assert(i->prealloc > 0); - g = lzma_alloc(sizeof(index_group) - + i->prealloc * sizeof(index_record), - allocator); --- -2.43.0 - diff --git a/meta/recipes-extended/xz/xz_5.8.2.bb b/meta/recipes-extended/xz/xz_5.8.3.bb similarity index 94% rename from meta/recipes-extended/xz/xz_5.8.2.bb rename to meta/recipes-extended/xz/xz_5.8.3.bb index 15eaa7a52f8..74efe561c6b 100644 --- a/meta/recipes-extended/xz/xz_5.8.2.bb +++ b/meta/recipes-extended/xz/xz_5.8.3.bb @@ -26,10 +26,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d38d562f6112174de93a9677682231b2 \ " SRC_URI = "https://github.com/tukaani-project/xz/releases/download/v${PV}/xz-${PV}.tar.gz \ - file://0001-liblzma-Fix-a-buffer-overflow-in-lzma_index_append.patch \ file://run-ptest \ - " -SRC_URI[sha256sum] = "ce09c50a5962786b83e5da389c90dd2c15ecd0980a258dd01f70f9e7ce58a8f1" + " +SRC_URI[sha256sum] = "3d3a1b973af218114f4f889bbaa2f4c037deaae0c8e815eec381c3d546b974a0" UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_URI = "https://github.com/tukaani-project/xz/releases/";
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236371): https://lists.openembedded.org/g/openembedded-core/message/236371 Mute This Topic: https://lists.openembedded.org/mt/119117281/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
