diff options
3 files changed, 73 insertions, 0 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32912-1.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32912-1.patch new file mode 100644 index 0000000000..c35c599502 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32912-1.patch | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | From cd077513f267e43ce4b659eb18a1734d8a369992 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Patrick Griffis <pgriffis@igalia.com> | ||
| 3 | Date: Wed, 5 Feb 2025 14:03:05 -0600 | ||
| 4 | Subject: [PATCH] auth-digest: Handle missing nonce | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992] | ||
| 7 | CVE: CVE-2025-32912 | ||
| 8 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
| 9 | --- | ||
| 10 | libsoup/auth/soup-auth-digest.c | 2 +- | ||
| 11 | tests/auth-test.c | 1 + | ||
| 12 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c | ||
| 15 | index 9eb7fa0e..d69a4013 100644 | ||
| 16 | --- a/libsoup/auth/soup-auth-digest.c | ||
| 17 | +++ b/libsoup/auth/soup-auth-digest.c | ||
| 18 | @@ -162,7 +162,7 @@ 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 | + if (!soup_auth_get_realm (auth) || !g_hash_table_contains (auth_params, "nonce")) | ||
| 24 | return FALSE; | ||
| 25 | |||
| 26 | g_free (priv->domain); | ||
| 27 | diff --git a/tests/auth-test.c b/tests/auth-test.c | ||
| 28 | index c651c7cd..484097f1 100644 | ||
| 29 | --- a/tests/auth-test.c | ||
| 30 | +++ b/tests/auth-test.c | ||
| 31 | @@ -1952,6 +1952,7 @@ main (int argc, char **argv) | ||
| 32 | g_test_add_data_func ("/auth/missing-params/realm", "Digest qop=\"auth\"", do_missing_params_test); | ||
| 33 | g_test_add_data_func ("/auth/missing-params/nonce", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"", do_missing_params_test); | ||
| 34 | 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); | ||
| 35 | + g_test_add_data_func ("/auth/missing-params/nonce-and-qop", "Digest realm=\"auth-test\"", do_missing_params_test); | ||
| 36 | |||
| 37 | ret = g_test_run (); | ||
| 38 | |||
| 39 | -- | ||
| 40 | GitLab | ||
| 41 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32912-2.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32912-2.patch new file mode 100644 index 0000000000..ad6f3a8028 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32912-2.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 910ebdcd3dd82386717a201c13c834f3a63eed7f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Patrick Griffis <pgriffis@igalia.com> | ||
| 3 | Date: Sat, 8 Feb 2025 12:30:13 -0600 | ||
| 4 | Subject: [PATCH] digest-auth: Handle NULL nonce | ||
| 5 | |||
| 6 | `contains` only handles a missing nonce, `lookup` handles both missing and empty. | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f] | ||
| 9 | CVE: CVE-2025-32912 | ||
| 10 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
| 11 | --- | ||
| 12 | libsoup/auth/soup-auth-digest.c | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c | ||
| 16 | index d69a4013..dc4dbfc5 100644 | ||
| 17 | --- a/libsoup/auth/soup-auth-digest.c | ||
| 18 | +++ b/libsoup/auth/soup-auth-digest.c | ||
| 19 | @@ -162,7 +162,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg, | ||
| 20 | guint qop_options; | ||
| 21 | gboolean ok = TRUE; | ||
| 22 | |||
| 23 | - if (!soup_auth_get_realm (auth) || !g_hash_table_contains (auth_params, "nonce")) | ||
| 24 | + if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce")) | ||
| 25 | return FALSE; | ||
| 26 | |||
| 27 | g_free (priv->domain); | ||
| 28 | -- | ||
| 29 | GitLab | ||
| 30 | |||
diff --git a/meta/recipes-support/libsoup/libsoup_3.4.4.bb b/meta/recipes-support/libsoup/libsoup_3.4.4.bb index 167163b91f..f62c657213 100644 --- a/meta/recipes-support/libsoup/libsoup_3.4.4.bb +++ b/meta/recipes-support/libsoup/libsoup_3.4.4.bb | |||
| @@ -24,6 +24,8 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ | |||
| 24 | file://CVE-2025-32909.patch \ | 24 | file://CVE-2025-32909.patch \ |
| 25 | file://CVE-2025-32911_CVE-2025-32913-1.patch \ | 25 | file://CVE-2025-32911_CVE-2025-32913-1.patch \ |
| 26 | file://CVE-2025-32911_CVE-2025-32913-2.patch \ | 26 | file://CVE-2025-32911_CVE-2025-32913-2.patch \ |
| 27 | file://CVE-2025-32912-1.patch \ | ||
| 28 | file://CVE-2025-32912-2.patch \ | ||
| 27 | " | 29 | " |
| 28 | SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa" | 30 | SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa" |
| 29 | 31 | ||
