2 files changed, 100 insertions, 1 deletions

diff --git a/meta/recipes-support/libsoup/libsoup/CVE-2025-4948.patch b/meta/recipes-support/libsoup/libsoup/CVE-2025-4948.patch
new file mode 100644
index 0000000000..e0e7b7a44f
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup/CVE-2025-4948.patch
@@ -0,0 +1,97 @@
+From 0076a5ef3f2a3d11805438e7fd90775f8c40569e Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 15 May 2025 17:49:11 +0200
+Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body
+
+It could happen that the boundary started at a place which resulted into
+a negative number, which in an unsigned integer is a very large value.
+Check the body size is not a negative value before setting it.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463>
+
+CVE: CVE-2025-4948
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ tests/multipart-test.c   | 40 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index 102ce37..a587fe7 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -204,7 +204,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                 */
+                part_body = g_bytes_new_from_bytes (body, // FIXME
+                                                    split - body_data,
+-                                                   end - 2 - split);
++                                                   end - 2 >= split ? end - 2 - split : 0);
+                g_ptr_array_add (multipart->bodies, part_body);
+ 
+                start = end;
+diff --git a/tests/multipart-test.c b/tests/multipart-test.c
+index f5b9868..92b673e 100644
+--- a/tests/multipart-test.c
++++ b/tests/multipart-test.c
+@@ -527,6 +527,45 @@ test_multipart_bounds_bad (void)
+        g_bytes_unref (bytes);
+ }
+ 
++static void
++test_multipart_too_large (void)
++{
++       const char *raw_body =
++               "-------------------\r\n"
++               "-\n"
++               "Cont\"\r\n"
++               "Content-Tynt----e:n\x8erQK\r\n"
++               "Content-Disposition:   name=  form-; name=\"file\"; filename=\"ype:i/  -d; ----\xae\r\n"
++               "Content-Typimag\x01/png--\\\n"
++               "\r\n"
++               "---:\n\r\n"
++               "\r\n"
++               "-------------------------------------\r\n"
++               "---------\r\n"
++               "----------------------";
++       GBytes *body;
++       GHashTable *params;
++       SoupMessageHeaders *headers;
++       SoupMultipart *multipart;
++
++       params = g_hash_table_new (g_str_hash, g_str_equal);
++       g_hash_table_insert (params, (gpointer) "boundary", (gpointer) "-----------------");
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_set_content_type (headers, "multipart/form-data", params);
++       g_hash_table_unref (params);
++
++       body = g_bytes_new_static (raw_body, strlen (raw_body));
++       multipart = soup_multipart_new_from_message (headers, body);
++       soup_message_headers_unref (headers);
++       g_bytes_unref (body);
++
++       g_assert_nonnull (multipart);
++       g_assert_cmpint (soup_multipart_get_length (multipart), ==, 1);
++       g_assert_true (soup_multipart_get_part (multipart, 0, &headers, &body));
++       g_assert_cmpint (g_bytes_get_size (body), ==, 0);
++       soup_multipart_free (multipart);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -556,6 +595,7 @@ main (int argc, char **argv)
+        g_test_add_data_func ("/multipart/async-small-reads", GINT_TO_POINTER (ASYNC_MULTIPART_SMALL_READS), test_multipart);
+        g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good);
+        g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad);
++       g_test_add_func ("/multipart/too-large", test_multipart_too_large);
+ 
+        ret = g_test_run ();
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup_3.6.5.bb b/meta/recipes-support/libsoup/libsoup_3.6.5.bb
index a8c0546677..772e21e09b 100644
--- a/meta/recipes-support/libsoup/libsoup_3.6.5.bb
+++ b/meta/recipes-support/libsoup/libsoup_3.6.5.bb
@@ -17,7 +17,9 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
            file://CVE-2025-32907-1.patch \
            file://CVE-2025-32907-2.patch \
            file://CVE-2025-32908-1.patch \
-           file://CVE-2025-32908-2.patch"
+           file://CVE-2025-32908-2.patch \
+           file://CVE-2025-4948.patch \
+"
 SRC_URI[sha256sum] = "6891765aac3e949017945c3eaebd8cc8216df772456dc9f460976fbdb7ada234"
 
 PROVIDES = "libsoup-3.0"