francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be Mon Sep 17 00:00:00 2001
|
|
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
|
|
Date: Wed, 11 Sep 2024 11:52:11 +0200
|
|
Subject: [PATCH] websocket: process the frame as soon as we read data
|
|
|
|
Otherwise we can enter in a read loop because we were not
|
|
validating the data until the all the data was read.
|
|
|
|
Fixes #391
|
|
|
|
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be]
|
|
CVE: CVE-2024-52532
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
libsoup/websocket/soup-websocket-connection.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsoup/websocket/soup-websocket-connection.c b/libsoup/websocket/soup-websocket-connection.c
|
|
index 2f7d920..df8f67d 100644
|
|
--- a/libsoup/websocket/soup-websocket-connection.c
|
|
+++ b/libsoup/websocket/soup-websocket-connection.c
|
|
@@ -1165,9 +1165,9 @@ soup_websocket_connection_read (SoupWebsocketConnection *self)
|
|
}
|
|
|
|
priv->incoming->len = len + count;
|
|
- } while (count > 0);
|
|
|
|
- process_incoming (self);
|
|
+ process_incoming (self);
|
|
+ } while (count > 0 && !priv->close_sent && !priv->io_closing);
|
|
|
|
if (end) {
|
|
if (!priv->close_sent || !priv->close_received) {
|
|
--
|
|
2.25.1
|
|
|