summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Anusuri <vanusuri@mvista.com>2025-05-13 16:21:26 +0530
committerSteve Sakoman <steve@sakoman.com>2025-05-16 08:58:06 -0700
commitfe91f67d38a0bf385acd913d10c117017ad41e0f (patch)
treef410f5987c5fcfff7aec06f20dec2d2d9d459584
parentcc7f7f1c296ce831ffa07fcf62e8cd0062f9098a (diff)
downloadpoky-fe91f67d38a0bf385acd913d10c117017ad41e0f.tar.gz
libsoup: Fix CVE-2025-32910
Upstream-Status: Backport from https://gitlab.gnome.org/GNOME/libsoup/-/commit/e40df6d48a1cbab56f5d15016cc861a503423cfe & https://gitlab.gnome.org/GNOME/libsoup/-/commit/405a8a34597a44bd58c4759e7d5e23f02c3b556a & https://gitlab.gnome.org/GNOME/libsoup/-/commit/ea16eeacb052e423eb5c3b0b705e5eab34b13832 (From OE-Core rev: aeaa106595f173f5646a17adb413a85e0d01887e) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat
-rw-r--r--meta/recipes-support/libsoup/libsoup/CVE-2025-32910-1.patch98
-rw-r--r--meta/recipes-support/libsoup/libsoup/CVE-2025-32910-2.patch149
-rw-r--r--meta/recipes-support/libsoup/libsoup/CVE-2025-32910-3.patch27
-rw-r--r--meta/recipes-support/libsoup/libsoup_3.0.7.bb3
4 files changed, 277 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-1.patch b/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-1.patch
new file mode 100644
index 0000000000..27011f587f
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-1.patch
@@ -0,0 +1,98 @@
1From e40df6d48a1cbab56f5d15016cc861a503423cfe Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Sun, 8 Dec 2024 20:00:35 -0600
4Subject: [PATCH] auth-digest: Handle missing realm in authenticate header
5
6Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e40df6d48a1cbab56f5d15016cc861a503423cfe]
7CVE: CVE-2025-32910
8Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
9---
10 libsoup/auth/soup-auth-digest.c | 3 ++
11 tests/auth-test.c | 50 +++++++++++++++++++++++++++++++++
12 2 files changed, 53 insertions(+)
13
14diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
15index 2e81849af..4f12e87a5 100644
16--- a/libsoup/auth/soup-auth-digest.c
17+++ b/libsoup/auth/soup-auth-digest.c
18@@ -148,6 +148,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
19 guint qop_options;
20 gboolean ok = TRUE;
21
22+ if (!soup_auth_get_realm (auth))
23+ return FALSE;
24+
25 g_free (priv->domain);
26 g_free (priv->nonce);
27 g_free (priv->opaque);
28diff --git a/tests/auth-test.c b/tests/auth-test.c
29index 158fdac10..3066e904a 100644
30--- a/tests/auth-test.c
31+++ b/tests/auth-test.c
32@@ -1866,6 +1866,55 @@ do_multiple_digest_algorithms (void)
33 soup_test_server_quit_unref (server);
34 }
35
36+static void
37+on_request_read_for_missing_realm (SoupServer *server,
38+ SoupServerMessage *msg,
39+ gpointer user_data)
40+{
41+ SoupMessageHeaders *response_headers = soup_server_message_get_response_headers (msg);
42+ soup_message_headers_replace (response_headers, "WWW-Authenticate", "Digest qop=\"auth\"");
43+}
44+
45+static void
46+do_missing_realm_test (void)
47+{
48+ SoupSession *session;
49+ SoupMessage *msg;
50+ SoupServer *server;
51+ SoupAuthDomain *digest_auth_domain;
52+ gint status;
53+ GUri *uri;
54+
55+ server = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
56+ soup_server_add_handler (server, NULL,
57+ server_callback, NULL, NULL);
58+ uri = soup_test_server_get_uri (server, "http", NULL);
59+
60+ digest_auth_domain = soup_auth_domain_digest_new (
61+ "realm", "auth-test",
62+ "auth-callback", server_digest_auth_callback,
63+ NULL);
64+ soup_auth_domain_add_path (digest_auth_domain, "/");
65+ soup_server_add_auth_domain (server, digest_auth_domain);
66+ g_object_unref (digest_auth_domain);
67+
68+ g_signal_connect (server, "request-read",
69+ G_CALLBACK (on_request_read_for_missing_realm),
70+ NULL);
71+
72+ session = soup_test_session_new (NULL);
73+ msg = soup_message_new_from_uri ("GET", uri);
74+ g_signal_connect (msg, "authenticate",
75+ G_CALLBACK (on_digest_authenticate),
76+ NULL);
77+
78+ status = soup_test_session_send_message (session, msg);
79+
80+ g_assert_cmpint (status, ==, SOUP_STATUS_UNAUTHORIZED);
81+ g_uri_unref (uri);
82+ soup_test_server_quit_unref (server);
83+}
84+
85 int
86 main (int argc, char **argv)
87 {
88@@ -1899,6 +1948,7 @@ main (int argc, char **argv)
89 g_test_add_func ("/auth/auth-uri", do_auth_uri_test);
90 g_test_add_func ("/auth/cancel-request-on-authenticate", do_cancel_request_on_authenticate);
91 g_test_add_func ("/auth/multiple-algorithms", do_multiple_digest_algorithms);
92+ g_test_add_func ("/auth/missing-realm", do_missing_realm_test);
93
94 ret = g_test_run ();
95
96--
97GitLab
98
diff --git a/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-2.patch b/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-2.patch
new file mode 100644
index 0000000000..b62e09cbdb
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-2.patch
@@ -0,0 +1,149 @@
1From 405a8a34597a44bd58c4759e7d5e23f02c3b556a Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Thu, 26 Dec 2024 18:18:35 -0600
4Subject: [PATCH] auth-digest: Handle missing nonce
5
6Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/405a8a34597a44bd58c4759e7d5e23f02c3b556a]
7CVE: CVE-2025-32910
8Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
9---
10 libsoup/auth/soup-auth-digest.c | 45 +++++++++++++++++++++++++--------
11 tests/auth-test.c | 19 ++++++++------
12 2 files changed, 46 insertions(+), 18 deletions(-)
13
14diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
15index 4f12e87a..350bfde6 100644
16--- a/libsoup/auth/soup-auth-digest.c
17+++ b/libsoup/auth/soup-auth-digest.c
18@@ -138,6 +138,19 @@ soup_auth_digest_get_qop (SoupAuthDigestQop qop)
19 return g_string_free (out, FALSE);
20 }
21
22+static gboolean
23+validate_params (SoupAuthDigest *auth_digest)
24+{
25+ SoupAuthDigestPrivate *priv = soup_auth_digest_get_instance_private (auth_digest);
26+
27+ if (priv->qop || priv->algorithm == SOUP_AUTH_DIGEST_ALGORITHM_MD5_SESS) {
28+ if (!priv->nonce)
29+ return FALSE;
30+ }
31+
32+ return TRUE;
33+}
34+
35 static gboolean
36 soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
37 GHashTable *auth_params)
38@@ -175,16 +188,21 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
39 if (priv->algorithm == -1)
40 ok = FALSE;
41
42- stale = g_hash_table_lookup (auth_params, "stale");
43- if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
44- recompute_hex_a1 (priv);
45- else {
46- g_free (priv->user);
47- priv->user = NULL;
48- g_free (priv->cnonce);
49- priv->cnonce = NULL;
50- memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
51- memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
52+ if (!validate_params (auth_digest))
53+ ok = FALSE;
54+
55+ if (ok) {
56+ stale = g_hash_table_lookup (auth_params, "stale");
57+ if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
58+ recompute_hex_a1 (priv);
59+ else {
60+ g_free (priv->user);
61+ priv->user = NULL;
62+ g_free (priv->cnonce);
63+ priv->cnonce = NULL;
64+ memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
65+ memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
66+ }
67 }
68
69 return ok;
70@@ -276,6 +294,8 @@ soup_auth_digest_compute_hex_a1 (const char *hex_urp,
71
72 /* In MD5-sess, A1 is hex_urp:nonce:cnonce */
73
74+ g_assert (nonce && cnonce);
75+
76 checksum = g_checksum_new (G_CHECKSUM_MD5);
77 g_checksum_update (checksum, (guchar *)hex_urp, strlen (hex_urp));
78 g_checksum_update (checksum, (guchar *)":", 1);
79@@ -366,6 +386,8 @@ soup_auth_digest_compute_response (const char *method,
80 if (qop) {
81 char tmp[9];
82
83+ g_assert (cnonce);
84+
85 g_snprintf (tmp, 9, "%.8x", nc);
86 g_checksum_update (checksum, (guchar *)tmp, strlen (tmp));
87 g_checksum_update (checksum, (guchar *)":", 1);
88@@ -429,6 +451,9 @@ soup_auth_digest_get_authorization (SoupAuth *auth, SoupMessage *msg)
89 g_return_val_if_fail (uri != NULL, NULL);
90 url = soup_uri_get_path_and_query (uri);
91
92+ g_assert (priv->nonce);
93+ g_assert (!priv->qop || priv->cnonce);
94+
95 soup_auth_digest_compute_response (soup_message_get_method (msg), url, priv->hex_a1,
96 priv->qop, priv->nonce,
97 priv->cnonce, priv->nc,
98diff --git a/tests/auth-test.c b/tests/auth-test.c
99index 3066e904..c651c7cd 100644
100--- a/tests/auth-test.c
101+++ b/tests/auth-test.c
102@@ -1867,16 +1867,17 @@ do_multiple_digest_algorithms (void)
103 }
104
105 static void
106-on_request_read_for_missing_realm (SoupServer *server,
107- SoupServerMessage *msg,
108- gpointer user_data)
109+on_request_read_for_missing_params (SoupServer *server,
110+ SoupServerMessage *msg,
111+ gpointer user_data)
112 {
113+ const char *auth_header = user_data;
114 SoupMessageHeaders *response_headers = soup_server_message_get_response_headers (msg);
115- soup_message_headers_replace (response_headers, "WWW-Authenticate", "Digest qop=\"auth\"");
116+ soup_message_headers_replace (response_headers, "WWW-Authenticate", auth_header);
117 }
118
119 static void
120-do_missing_realm_test (void)
121+do_missing_params_test (gconstpointer auth_header)
122 {
123 SoupSession *session;
124 SoupMessage *msg;
125@@ -1899,8 +1900,8 @@ do_missing_realm_test (void)
126 g_object_unref (digest_auth_domain);
127
128 g_signal_connect (server, "request-read",
129- G_CALLBACK (on_request_read_for_missing_realm),
130- NULL);
131+ G_CALLBACK (on_request_read_for_missing_params),
132+ (gpointer)auth_header);
133
134 session = soup_test_session_new (NULL);
135 msg = soup_message_new_from_uri ("GET", uri);
136@@ -1948,7 +1949,9 @@ main (int argc, char **argv)
137 g_test_add_func ("/auth/auth-uri", do_auth_uri_test);
138 g_test_add_func ("/auth/cancel-request-on-authenticate", do_cancel_request_on_authenticate);
139 g_test_add_func ("/auth/multiple-algorithms", do_multiple_digest_algorithms);
140- g_test_add_func ("/auth/missing-realm", do_missing_realm_test);
141+ g_test_add_data_func ("/auth/missing-params/realm", "Digest qop=\"auth\"", do_missing_params_test);
142+ g_test_add_data_func ("/auth/missing-params/nonce", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"", do_missing_params_test);
143+ g_test_add_data_func ("/auth/missing-params/nonce-md5-sess", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\" algorithm=\"MD5-sess\"", do_missing_params_test);
144
145 ret = g_test_run ();
146
147--
148GitLab
149
diff --git a/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-3.patch b/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-3.patch
new file mode 100644
index 0000000000..32e0c86e62
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup/CVE-2025-32910-3.patch
@@ -0,0 +1,27 @@
1From ea16eeacb052e423eb5c3b0b705e5eab34b13832 Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Fri, 27 Dec 2024 13:52:52 -0600
4Subject: [PATCH] auth-digest: Fix leak
5
6Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/ea16eeacb052e423eb5c3b0b705e5eab34b13832]
7CVE: CVE-2025-32910
8Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
9---
10 libsoup/auth/soup-auth-digest.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
14index 350bfde6..9eb7fa0e 100644
15--- a/libsoup/auth/soup-auth-digest.c
16+++ b/libsoup/auth/soup-auth-digest.c
17@@ -72,6 +72,7 @@ soup_auth_digest_finalize (GObject *object)
18 g_free (priv->nonce);
19 g_free (priv->domain);
20 g_free (priv->cnonce);
21+ g_free (priv->opaque);
22
23 memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
24 memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
25--
26GitLab
27
diff --git a/meta/recipes-support/libsoup/libsoup_3.0.7.bb b/meta/recipes-support/libsoup/libsoup_3.0.7.bb
index 4fa8fce1c4..2c05ef338e 100644
--- a/meta/recipes-support/libsoup/libsoup_3.0.7.bb
+++ b/meta/recipes-support/libsoup/libsoup_3.0.7.bb
@@ -22,6 +22,9 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
22 file://CVE-2025-32906-1.patch \ 22 file://CVE-2025-32906-1.patch \
23 file://CVE-2025-32906-2.patch \ 23 file://CVE-2025-32906-2.patch \
24 file://CVE-2025-32909.patch \ 24 file://CVE-2025-32909.patch \
25 file://CVE-2025-32910-1.patch \
26 file://CVE-2025-32910-2.patch \
27 file://CVE-2025-32910-3.patch \
25 " 28 "
26SRC_URI[sha256sum] = "ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8" 29SRC_URI[sha256sum] = "ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8"
27 30
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-14 11:28:04 +0000