mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-07 13:40:36 +02:00
40a10d1f4a
The patches are a subset taken from Debian (see: <https://sources.debian.org/patches/libsoup3/3.6.5-3/>). * gnu/packages/patches/libsoup-auth-digest-fix-crash.patch * gnu/packages/patches/libsoup-deadlock-in-add_listener_in_thread.patch * gnu/packages/patches/libsoup-fix-merge-of-ranges.patch * gnu/packages/patches/libsoup-memory-leak-in-soup_form_decode.patch * gnu/packages/patches/libsoup-multipart-bounds-check.patch * gnu/packages/patches/libsoup-use-libdl-instead-of-gmodule.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/gnome.scm (libsoup-minimal): Apply them. Change-Id: I7e4968c1d87e28860fc68616f6107d018e0d93dd
107 lines
3.8 KiB
Diff
107 lines
3.8 KiB
Diff
From: Milan Crha <mcrha@redhat.com>
|
|
Date: Tue, 15 Apr 2025 09:03:00 +0200
|
|
Subject: multipart: Fix read out of buffer bounds under
|
|
soup_multipart_new_from_message()
|
|
|
|
This is CVE-2025-32914, special crafted input can cause read out of buffer bounds
|
|
of the body argument.
|
|
|
|
Origin: upstream, 3.7.0, commit:5bfcf8157597f2d327050114fb37ff600004dbcf
|
|
Bug: https://gitlab.gnome.org/GNOME/libsoup/-/issues/436
|
|
Bug-CVE: https://security-tracker.debian.org/tracker/CVE-2025-32914
|
|
Bug-Debian: https://bugs.debian.org/1103267
|
|
---
|
|
libsoup/soup-multipart.c | 2 +-
|
|
tests/multipart-test.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 59 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
|
|
index 2421c91..102ce37 100644
|
|
--- a/libsoup/soup-multipart.c
|
|
+++ b/libsoup/soup-multipart.c
|
|
@@ -173,7 +173,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
|
|
return NULL;
|
|
}
|
|
|
|
- split = strstr (start, "\r\n\r\n");
|
|
+ split = g_strstr_len (start, body_end - start, "\r\n\r\n");
|
|
if (!split || split > end) {
|
|
soup_multipart_free (multipart);
|
|
return NULL;
|
|
diff --git a/tests/multipart-test.c b/tests/multipart-test.c
|
|
index 2c0e7e9..f5b9868 100644
|
|
--- a/tests/multipart-test.c
|
|
+++ b/tests/multipart-test.c
|
|
@@ -471,6 +471,62 @@ test_multipart (gconstpointer data)
|
|
loop = NULL;
|
|
}
|
|
|
|
+static void
|
|
+test_multipart_bounds_good (void)
|
|
+{
|
|
+ #define TEXT "line1\r\nline2"
|
|
+ SoupMultipart *multipart;
|
|
+ SoupMessageHeaders *headers, *set_headers = NULL;
|
|
+ GBytes *bytes, *set_bytes = NULL;
|
|
+ const char *raw_data = "--123\r\nContent-Type: text/plain;\r\n\r\n" TEXT "\r\n--123--\r\n";
|
|
+ gboolean success;
|
|
+
|
|
+ headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
|
|
+ soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
|
|
+
|
|
+ bytes = g_bytes_new (raw_data, strlen (raw_data));
|
|
+
|
|
+ multipart = soup_multipart_new_from_message (headers, bytes);
|
|
+
|
|
+ g_assert_nonnull (multipart);
|
|
+ g_assert_cmpint (soup_multipart_get_length (multipart), ==, 1);
|
|
+ success = soup_multipart_get_part (multipart, 0, &set_headers, &set_bytes);
|
|
+ g_assert_true (success);
|
|
+ g_assert_nonnull (set_headers);
|
|
+ g_assert_nonnull (set_bytes);
|
|
+ g_assert_cmpint (strlen (TEXT), ==, g_bytes_get_size (set_bytes));
|
|
+ g_assert_cmpstr ("text/plain", ==, soup_message_headers_get_content_type (set_headers, NULL));
|
|
+ g_assert_cmpmem (TEXT, strlen (TEXT), g_bytes_get_data (set_bytes, NULL), g_bytes_get_size (set_bytes));
|
|
+
|
|
+ soup_message_headers_unref (headers);
|
|
+ g_bytes_unref (bytes);
|
|
+
|
|
+ soup_multipart_free (multipart);
|
|
+
|
|
+ #undef TEXT
|
|
+}
|
|
+
|
|
+static void
|
|
+test_multipart_bounds_bad (void)
|
|
+{
|
|
+ SoupMultipart *multipart;
|
|
+ SoupMessageHeaders *headers;
|
|
+ GBytes *bytes;
|
|
+ const char *raw_data = "--123\r\nContent-Type: text/plain;\r\nline1\r\nline2\r\n--123--\r\n";
|
|
+
|
|
+ headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
|
|
+ soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
|
|
+
|
|
+ bytes = g_bytes_new (raw_data, strlen (raw_data));
|
|
+
|
|
+ /* it did read out of raw_data/bytes bounds */
|
|
+ multipart = soup_multipart_new_from_message (headers, bytes);
|
|
+ g_assert_null (multipart);
|
|
+
|
|
+ soup_message_headers_unref (headers);
|
|
+ g_bytes_unref (bytes);
|
|
+}
|
|
+
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
@@ -498,6 +554,8 @@ main (int argc, char **argv)
|
|
g_test_add_data_func ("/multipart/sync", GINT_TO_POINTER (SYNC_MULTIPART), test_multipart);
|
|
g_test_add_data_func ("/multipart/async", GINT_TO_POINTER (ASYNC_MULTIPART), test_multipart);
|
|
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);
|
|
|
|
ret = g_test_run ();
|
|
|