diff options
-rw-r--r-- | meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch | 39 | ||||
-rw-r--r-- | meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch new file mode 100644 index 0000000000..41dd3ff3f4 --- /dev/null +++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 8158b4084dcba2a233dfcb7359c53ab2840148f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Milan Crha <mcrha@redhat.com> | ||
3 | Date: Tue, 15 Apr 2025 12:17:39 +0200 | ||
4 | Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges | ||
5 | |||
6 | It had been skipping every second range, which generated an array | ||
7 | of a lot of insane ranges, causing large memory usage by the server. | ||
8 | |||
9 | Closes #428 | ||
10 | |||
11 | Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452> | ||
12 | |||
13 | CVE: CVE-2025-32907 | ||
14 | Upstream-Status: Backport | ||
15 | [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/diffs?commit_id=9bb92f7a685e31e10e9e8221d0342280432ce836] | ||
16 | |||
17 | Test part not applied since test codes use some functions not in this | ||
18 | version | ||
19 | |||
20 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
21 | --- | ||
22 | libsoup/soup-message-headers.c | 1 + | ||
23 | 1 files changed, 1 insertions(+) | ||
24 | |||
25 | diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c | ||
26 | index 78b2455..00b9763 100644 | ||
27 | --- a/libsoup/soup-message-headers.c | ||
28 | +++ b/libsoup/soup-message-headers.c | ||
29 | @@ -1024,6 +1024,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders *hdrs, | ||
30 | if (cur->start <= prev->end) { | ||
31 | prev->end = MAX (prev->end, cur->end); | ||
32 | g_array_remove_index (array, i); | ||
33 | + i--; | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | -- | ||
38 | 2.34.1 | ||
39 | |||
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index 507cbbe7ae..4918236b61 100644 --- a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | |||
@@ -36,6 +36,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
36 | file://CVE-2024-52531-1.patch \ | 36 | file://CVE-2024-52531-1.patch \ |
37 | file://CVE-2024-52531-2.patch \ | 37 | file://CVE-2024-52531-2.patch \ |
38 | file://CVE-2025-4476.patch \ | 38 | file://CVE-2025-4476.patch \ |
39 | file://CVE-2025-32907.patch \ | ||
39 | " | 40 | " |
40 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" | 41 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" |
41 | 42 | ||