From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
devel@lists.libvirt.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Pierrick Bouvier" <pierrick.bouvier@oss.qualcomm.com>,
qemu-stable@nongnu.org, "Denis V. Lunev" <den@openvz.org>
Subject: [PULL v2 06/13] io/channel-websock: handle a blocked write during the handshake
Date: Fri, 4 Sep 2026 17:06:36 +0100 [thread overview]
Message-ID: <20260904160643.353833-7-berrange@redhat.com> (raw)
In-Reply-To: <20260904160643.353833-1-berrange@redhat.com>
From: Denis V. Lunev <den@openvz.org>
qio_channel_websock_handshake_send() treats every negative return from
qio_channel_write() as fatal and passes err to error_get_pretty().
QIO_CHANNEL_ERR_BLOCK is negative but leaves err NULL, so a socket
which cannot take the response immediately crashes QEMU before the
client has authenticated.
Keep the G_IO_OUT watch armed and retry instead.
Fixes: 2d1d0e70cf3e ("io: add QIOChannelWebsock class")
Fixes: CVE-2026-84788
Cc: qemu-stable@nongnu.org
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
io/channel-websock.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index 66c91ed2a2..8f27b1f12b 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -562,6 +562,11 @@ static gboolean qio_channel_websock_handshake_send(QIOChannel *ioc,
wioc->encoutput.offset,
&err);
+ if (ret == QIO_CHANNEL_ERR_BLOCK) {
+ /* Socket buffer is full, the G_IO_OUT watch stays armed */
+ return TRUE;
+ }
+
if (ret < 0) {
trace_qio_channel_websock_handshake_fail(ioc, error_get_pretty(err));
qio_task_set_error(task, err);
--
2.55.0
next prev parent reply other threads:[~2026-09-04 16:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-04 16:06 [PULL v2 00/13] Misc fixes patches Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 01/13] crypto: Use g_autofree Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 02/13] crypto/x509-utils: don't double set errp Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 03/13] crypto/x509-utils: propagate the error Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 04/13] io/channel-socket: do not treat a zero length write as an error Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 05/13] io/channel-websock: send an HTTP 400 when the greeting has no space Daniel P. Berrangé
2026-09-04 16:06 ` Daniel P. Berrangé [this message]
2026-09-04 16:06 ` [PULL v2 07/13] tests/unit: add websock handshake test Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 08/13] io/channel-websock: do not lose QIO_CHANNEL_ERR_BLOCK while reading Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 09/13] tests/unit: cover blocked IO during the websock handshake Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 10/13] crypto: deprecate the AF_ALG crypto backend Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 11/13] gitlab: use --emacs --quiet for checkpatch.pl instead of --terse Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 12/13] configure: correctly honour --disable-containers Daniel P. Berrangé
2026-09-07 10:48 ` Daniel P. Berrangé
2026-09-04 16:06 ` [PULL v2 13/13] docs/system/security: exclude uninitialized stack variables as bugs Daniel P. Berrangé
2026-09-06 14:14 ` [PULL v2 00/13] Misc fixes patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260904160643.353833-7-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=den@openvz.org \
--cc=devel@lists.libvirt.org \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pierrick.bouvier@oss.qualcomm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.