diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-06-18 10:59:44 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-06-25 08:11:58 -0700 |
| commit | 09407f375dd9b1b6a3684f4a18f70c6ee7e4b5dd (patch) | |
| tree | ce7386d0024e1295c1a378601ab9b13a3bd9bc9b | |
| parent | 3aa44948cbfbfaf17843710e56156352d126c7e1 (diff) | |
| download | poky-09407f375dd9b1b6a3684f4a18f70c6ee7e4b5dd.tar.gz | |
libsoup-2.4: fix CVE-2025-4948
Refer:
http://gitlab.gnome.org/GNOME/libsoup/-/issues/449
(From OE-Core rev: d5af0295d26f8967dfe49a53ffa6f275e249d087)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch new file mode 100644 index 0000000000..b15b8c763d --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From dfdc9b3cc73e6fe88cc12792ba00e14642572339 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Milan Crha <mcrha@redhat.com> | ||
| 3 | Date: Thu, 15 May 2025 17:49:11 +0200 | ||
| 4 | Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body | ||
| 5 | |||
| 6 | It could happen that the boundary started at a place which resulted into | ||
| 7 | a negative number, which in an unsigned integer is a very large value. | ||
| 8 | Check the body size is not a negative value before setting it. | ||
| 9 | |||
| 10 | Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449 | ||
| 11 | |||
| 12 | Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463> | ||
| 13 | |||
| 14 | CVE: CVE-2025-4948 | ||
| 15 | Upstream-Status: Backport | ||
| 16 | [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0] | ||
| 17 | |||
| 18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 19 | --- | ||
| 20 | libsoup/soup-multipart.c | 2 +- | ||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c | ||
| 24 | index dd93973..ce2fc10 100644 | ||
| 25 | --- a/libsoup/soup-multipart.c | ||
| 26 | +++ b/libsoup/soup-multipart.c | ||
| 27 | @@ -214,7 +214,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, | ||
| 28 | */ | ||
| 29 | part_body = soup_buffer_new_subbuffer (flattened, | ||
| 30 | split - flattened->data, | ||
| 31 | - end - 2 - split); | ||
| 32 | + end - 2 >= split ? end - 2 - split : 0); | ||
| 33 | g_ptr_array_add (multipart->bodies, part_body); | ||
| 34 | |||
| 35 | start = end; | ||
| 36 | -- | ||
| 37 | 2.34.1 | ||
| 38 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb index 347fe1aa21..aa2903030d 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | |||
| @@ -40,6 +40,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
| 40 | file://CVE-2025-4969.patch \ | 40 | file://CVE-2025-4969.patch \ |
| 41 | file://CVE-2025-32907.patch \ | 41 | file://CVE-2025-32907.patch \ |
| 42 | file://CVE-2025-46421.patch \ | 42 | file://CVE-2025-46421.patch \ |
| 43 | file://CVE-2025-4948.patch \ | ||
| 43 | " | 44 | " |
| 44 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" | 45 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" |
| 45 | 46 | ||
