diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-06-18 10:59:42 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-06-25 08:11:57 -0700 |
| commit | 6a19b931f0a44d31866a6c75e301c2dc7719d482 (patch) | |
| tree | e3856b660cd15c4f4952e06f8e8f9d124bce07bc | |
| parent | 467cc324399501ec6e3c14c28ff72ec97bcc6ae5 (diff) | |
| download | poky-6a19b931f0a44d31866a6c75e301c2dc7719d482.tar.gz | |
libsoup-2.4: fix CVE-2025-32907
Refer:
https://gitlab.gnome.org/GNOME/libsoup/-/issues/428
(From OE-Core rev: e6d9dd16d9b70cc8d3a9ca8b2fc542d547b456b9)
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-32907.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch new file mode 100644 index 0000000000..41dd3ff3f4 --- /dev/null +++ b/meta/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/recipes-support/libsoup/libsoup-2.4_2.74.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.2.bb index 11552df80a..38307fa3d5 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 | |||
| @@ -38,6 +38,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
| 38 | file://CVE-2025-32052.patch \ | 38 | file://CVE-2025-32052.patch \ |
| 39 | file://CVE-2025-32053.patch \ | 39 | file://CVE-2025-32053.patch \ |
| 40 | file://CVE-2025-4969.patch \ | 40 | file://CVE-2025-4969.patch \ |
| 41 | file://CVE-2025-32907.patch \ | ||
| 41 | " | 42 | " |
| 42 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" | 43 | SRC_URI[sha256sum] = "f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159" |
| 43 | 44 | ||
