16accb6b24
- 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)
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From aad0dcf22ee9fdfefa6b72055268240cceccfe4c Mon Sep 17 00:00:00 2001
|
|
From: Milan Crha <mcrha@redhat.com>
|
|
Date: Mon, 28 Apr 2025 10:55:42 +0200
|
|
Subject: [PATCH 2/2] soup-server-http2: Correct check of the validity of the
|
|
constructed connection URI
|
|
|
|
RFC 5740: the CONNECT has unset the "scheme" and "path", thus allow them unset.
|
|
|
|
The commit a792b23ab87cacbf4dd9462bf7b675fa678efbae also missed to decrement
|
|
the `io->in_callback` in the early returns.
|
|
|
|
Related to #429
|
|
|
|
CVE: CVE-2025-32908
|
|
Upstream-Status: Backport
|
|
[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/453/diffs?commit_id=527428a033df573ef4558ce1106e080fd9ec5c71]
|
|
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
---
|
|
.../server/http2/soup-server-message-io-http2.c | 15 ++++++++++-----
|
|
1 file changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/libsoup/server/http2/soup-server-message-io-http2.c b/libsoup/server/http2/soup-server-message-io-http2.c
|
|
index f1fe2d5..913afb4 100644
|
|
--- a/libsoup/server/http2/soup-server-message-io-http2.c
|
|
+++ b/libsoup/server/http2/soup-server-message-io-http2.c
|
|
@@ -771,13 +771,18 @@ on_frame_recv_callback (nghttp2_session *session,
|
|
char *uri_string;
|
|
GUri *uri;
|
|
|
|
- if (msg_io->scheme == NULL || msg_io->authority == NULL || msg_io->path == NULL)
|
|
- return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
|
|
- uri_string = g_strdup_printf ("%s://%s%s", msg_io->scheme, msg_io->authority, msg_io->path);
|
|
+ if (msg_io->authority == NULL) {
|
|
+ io->in_callback--;
|
|
+ return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
|
|
+ }
|
|
+ /* RFC 5740: the CONNECT has unset the "scheme" and "path", but the GUri requires the scheme, thus let it be "(null)" */
|
|
+ uri_string = g_strdup_printf ("%s://%s%s", msg_io->scheme, msg_io->authority, msg_io->path == NULL ? "" : msg_io->path);
|
|
uri = g_uri_parse (uri_string, SOUP_HTTP_URI_FLAGS, NULL);
|
|
g_free (uri_string);
|
|
- if (uri == NULL)
|
|
- return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
|
|
+ if (uri == NULL) {
|
|
+ io->in_callback--;
|
|
+ return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
|
|
+ }
|
|
soup_server_message_set_uri (msg_io->msg, uri);
|
|
g_uri_unref (uri);
|
|
|
|
--
|
|
2.34.1
|
|
|