Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
@@ -0,0 +1,97 @@
|
||||
From a23ce8f8e60e79990e26376c8b0d40841aed4b81 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 e1c442e..27257e4 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 84852e2..2ae888c 100644
|
||||
--- a/tests/multipart-test.c
|
||||
+++ b/tests/multipart-test.c
|
||||
@@ -548,6 +548,45 @@ test_multipart_bounds_bad_2 (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)
|
||||
{
|
||||
@@ -578,6 +617,7 @@ main (int argc, char **argv)
|
||||
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/bounds-bad-2", test_multipart_bounds_bad_2);
|
||||
+ g_test_add_func ("/multipart/too-large", test_multipart_too_large);
|
||||
|
||||
ret = g_test_run ();
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
Reference in New Issue
Block a user