diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-05-30 15:13:00 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-06-13 09:01:25 -0700 |
| commit | dc2f0966866179f27e5901ff413321b76c2c4571 (patch) | |
| tree | e9a28c83ee7043369fcfe851719a852b12b76e18 | |
| parent | 908bd59cfc80d78e3d1b51102da528114d14cd00 (diff) | |
| download | poky-dc2f0966866179f27e5901ff413321b76c2c4571.tar.gz | |
libsoup-2.4: fix CVE-2025-32914
Refer:
https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450
(From OE-Core rev: 1b3ed35fe9afa00987f64415a43ae9ed4f53e7f3)
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-32914.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch new file mode 100644 index 0000000000..9f3bb21a25 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From ac844b9fc7945c38ea21fb7cf1a49a5c226d7c9c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Mon, 12 May 2025 16:17:20 +0800 | ||
| 4 | Subject: [PATCH] Resolve "(CVE-2025-32914) (#YWH-PGM9867-23) OOB Read on | ||
| 5 | libsoup through function "soup_multipart_new_from_message" in | ||
| 6 | soup-multipart.c leads to crash or exit of process" | ||
| 7 | |||
| 8 | CVE: CVE-2025-32914 | ||
| 9 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450/diffs?commit_id=5bfcf8157597f2d327050114fb37ff600004dbcf] | ||
| 10 | |||
| 11 | Test code are not added since some functions not aligned with version | ||
| 12 | 2.74.3 | ||
| 13 | |||
| 14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 15 | --- | ||
| 16 | libsoup/soup-multipart.c | 2 +- | ||
| 17 | 1 files changed, 1 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c | ||
| 20 | index a7e550f..dd93973 100644 | ||
| 21 | --- a/libsoup/soup-multipart.c | ||
| 22 | +++ b/libsoup/soup-multipart.c | ||
| 23 | @@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers, | ||
| 24 | return NULL; | ||
| 25 | } | ||
| 26 | |||
| 27 | - split = strstr (start, "\r\n\r\n"); | ||
| 28 | + split = g_strstr_len (start, body_end - start, "\r\n\r\n"); | ||
| 29 | if (!split || split > end) { | ||
| 30 | soup_multipart_free (multipart); | ||
| 31 | soup_buffer_free (flattened); | ||
| 32 | |||
| 33 | -- | ||
| 34 | 2.34.1 | ||
| 35 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index 79ffa19c20..7c1de29fd5 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | |||
| @@ -21,6 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
| 21 | file://CVE-2025-2784.patch \ | 21 | file://CVE-2025-2784.patch \ |
| 22 | file://CVE-2024-52530.patch \ | 22 | file://CVE-2024-52530.patch \ |
| 23 | file://CVE-2025-32906.patch \ | 23 | file://CVE-2025-32906.patch \ |
| 24 | file://CVE-2025-32914.patch \ | ||
| 24 | " | 25 | " |
| 25 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" | 26 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" |
| 26 | 27 | ||
