mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-18 08:15:56 +01:00
libsoup-2.4: fix CVE-2025-4969
Refer: https://gitlab.gnome.org/GNOME/libsoup/-/issues/447 Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
63e3fe6083
commit
41ffcb51e1
|
|
@ -0,0 +1,37 @@
|
||||||
|
From a7d0c58608ed830bedfb6b92aea11e00feb55aa9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Milan Crha <mcrha@redhat.com>
|
||||||
|
Date: Mon, 19 May 2025 17:48:27 +0200
|
||||||
|
Subject: [PATCH] soup-multipart: Verify array bounds before accessing its
|
||||||
|
members
|
||||||
|
|
||||||
|
The boundary could be at a place which, calculated, pointed
|
||||||
|
before the beginning of the array. Check the bounds, to avoid
|
||||||
|
read out of the array bounds.
|
||||||
|
|
||||||
|
Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447
|
||||||
|
|
||||||
|
CVE: CVE-2025-4969
|
||||||
|
Upstream-Status: Backport
|
||||||
|
[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/467/diffs?commit_id=b5b4dd10d4810f0c87b4eaffe88504f06e502f33]
|
||||||
|
|
||||||
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||||
|
---
|
||||||
|
libsoup/soup-multipart.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
|
||||||
|
index ce2fc10..a29cdf0 100644
|
||||||
|
--- a/libsoup/soup-multipart.c
|
||||||
|
+++ b/libsoup/soup-multipart.c
|
||||||
|
@@ -108,7 +108,7 @@ find_boundary (const char *start, const char *end,
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Check that it's at start of line */
|
||||||
|
- if (!(b == start || (b[-1] == '\n' && b[-2] == '\r')))
|
||||||
|
+ if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r')))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/* Check for "--" or "\r\n" after boundary */
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
|
|
@ -38,6 +38,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
|
||||||
file://CVE-2025-4476.patch \
|
file://CVE-2025-4476.patch \
|
||||||
file://CVE-2025-32907.patch \
|
file://CVE-2025-32907.patch \
|
||||||
file://CVE-2025-4948.patch \
|
file://CVE-2025-4948.patch \
|
||||||
|
file://CVE-2025-4969.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
|
SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user