libsoup-2.4: Fix CVE-2025-46420

Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/c9083869ec2a3037e6df4bd86b45c419ba295f8e]

(From OE-Core rev: 7c963f68cb8dfdea3e1664078037303ea3f29e65)

Signed-off-by: Ashish Sharma <asharma@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

2 files changed, 61 insertions, 0 deletions

diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
new file mode 100644
index 0000000000..37ab16dc05
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
@@ -0,0 +1,60 @@
+From c9083869ec2a3037e6df4bd86b45c419ba295f8e Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Thu, 26 Dec 2024 18:31:42 -0600
+Subject: [PATCH] soup_header_parse_quality_list: Fix leak
+
+When iterating over the parsed list we now steal the allocated strings that we want and then free_full the list which may contain remaining strings.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/c9083869ec2a3037e6df4bd86b45c419ba295f8e]
+CVE: CVE-2025-46420
+Signed-off-by: Ashish Sharma <asharma@mvista.com>
+
+ libsoup/soup-headers.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index a5f7a7f6..85385cea 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -530,7 +530,7 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+        GSList *unsorted;
+        QualityItem *array;
+        GSList *sorted, *iter;
+-       char *item, *semi;
++       char *semi;
+        const char *param, *equal, *value;
+        double qval;
+        int n;
+@@ -543,9 +543,8 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+        unsorted = soup_header_parse_list (header);
+        array = g_new0 (QualityItem, g_slist_length (unsorted));
+        for (iter = unsorted, n = 0; iter; iter = iter->next) {
+-               item = iter->data;
+                qval = 1.0;
+-               for (semi = strchr (item, ';'); semi; semi = strchr (semi + 1, ';')) {
++               for (semi = strchr (iter->data, ';'); semi; semi = strchr (semi + 1, ';')) {
+                        param = skip_lws (semi + 1);
+                        if (*param != 'q')
+                                continue;
+@@ -577,15 +576,15 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+                if (qval == 0.0) {
+                        if (unacceptable) {
+                                *unacceptable = g_slist_prepend (*unacceptable,
+-                                                                item);
++                                                                g_steal_pointer (&iter->data));
+                        }
+                } else {
+-                       array[n].item = item;
++                       array[n].item = g_steal_pointer (&iter->data);
+                        array[n].qval = qval;
+                        n++;
+                }
+        }
+-       g_slist_free (unsorted);
++       g_slist_free_full (unsorted, g_free);
+ 
+        qsort (array, n, sizeof (QualityItem), sort_by_qval);
+        sorted = NULL;
+-- 
+GitLab
+
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 3aaa06a541..fa4dece0e9 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
@@ -22,6 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
            file://CVE-2025-32906-1.patch \
            file://CVE-2025-32906-2.patch \
            file://CVE-2025-32909.patch \
+           file://CVE-2025-46420.patch \
           "
 SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"