From nobody Sat Sep 26 20:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1788170560; cv=none; d=zohomail.com; s=zohoarc; b=hifENSCm4UQrMIFBMgj8vdM11kflaMUOBTAiBazIRut1iYJamQxD3E26ODyLnetXroWl4q/xERwOYyHwHf9IE2iL6JM55CG61wbKqRUGH1rqwfTFg0tr+SIGfHJXU77j/p/XSUEvV/yNdLxURRb2XOlYHh1R/mAPxb6hKq/KRxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788170560; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WuBxW5Qk+qrLfNk8wOq6IIiADXNVrNAOwMYrteRNbjE=; b=GAPyc++Uz5TF0rKvEa/iL88LK3MpBK3e3/jwRxYwTwVaW/0u7oDAuJF6ursKjmKhsuntDvM+QL+DV6nx2I0mE5X8deq7YTcjitLE76ypECcreqjHrbcQM6s1r/M/qmOcNpEoY3ZcAPHudN98aWR/cNigbIuHRhcEJ4wtFlS/mSU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788170560665355.1138498482163; Mon, 31 Aug 2026 03:02:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x0yq1-0003WC-CX; Mon, 31 Aug 2026 06:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x0ypy-0003Vc-E5 for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:01:59 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x0ypw-0001hc-Q9 for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:01:58 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-4843f205a5bso181305f8f.1 for ; Mon, 31 Aug 2026 03:01:56 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:3bc1:c53b:30b:203e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482fbb33070sm22362383f8f.36.2026.08.31.03.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 03:01:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1788170515; x=1788775315; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=WuBxW5Qk+qrLfNk8wOq6IIiADXNVrNAOwMYrteRNbjE=; b=UYLcN39F7J2xie7+1WZ8+VoFFkeJhf6h3O8sf8sFXEEyRSNaYNEDXoVknc5PGkSL3n KLPiinZ9GddemuIeUMVChB8cFj/aOJwnzCRpx7/YgjZcJG1FoYFGqpV00ikDzad6bFRD bN0nKjbyca7qK7we6iHB1QV/Cc9WhFwf2bgObWevtI29DfLaAWqZMLopnr83gSOF7fTN 251RUsg73en7LoSva4ugbO/uX2mKVOGn3UPsHjfHK6Vdnvovk8G4RGpR0CQ/2+cbtn57 1xTxBevcrBwP9FKjdBPdQK9qK1DrZkfyJa0wvcdyomS4jodyMprE9lW6W/rVx33JP3OR waeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788170515; x=1788775315; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=WuBxW5Qk+qrLfNk8wOq6IIiADXNVrNAOwMYrteRNbjE=; b=F6hdeac2KjXKSnIyQq5oZ7aFgWWIoANpOYz+DLPHq+IsonUzX1tT56R/5dPJH6Ve8m gIKq6MuPqx1xCjHkBgwa02LeEidXS0Set6T72lE8R8cIu6bV4+bIzUF6qMQSjBXp59iU arA6QonogyTd+OAAm64ipA2YsNQbLLm4tU8S1jz3iFzbdMDYdn/EhCSK2FBrjbRPnKMn TYrDsi5wMJWr2pGShExBfdlwSgkggQlNDrclQRLG/rLt9vqIp8nWQIhg9mIaJAY/R1iM UHaEqFAREuj8pbJuGvCBbJhukrfLMdNxBmXNNRHApR1gkPVCwIBhXVm84zyfDhfCpjYv lU1Q== X-Gm-Message-State: AFuF++krZNIBM5Cs0pxj1nns2jZomBfqOCirkFSSvQG043I5nDd89XwK JbjYrGWc4ghbPBqIyIm+CVxsOnKQBp3QZHjc9o6uIOSfs7Le3QJ6MUm6uEn4RBuuoS2FiqIMGZH 5yPMO X-Gm-Gg: AYBFou2Osg3bu4LVeY8e2MGHkt1VpbX6nNEQ9kXEJaAJqjavW29xtVm+JIBOKSW+1rz eqXx9z69zbciMAqgaOV3XtrhAkaCO0Qa/HHod+XQSR7W+PW9XipzxUjpjoTjewzyFbU0Ls+kt0x SA8B7DMLdWXJ2WRs/v+J5UN2Uah+zsdPc9eVAQmB8PtSSo8w7KoLa5B7awF3cOO0p91qXcqasKB f0aMMVXHJ4R+Ca6YRk7v8jaUrWTRwxWZ1MhunbwPTbhTPWQw10yzSBPo1vcYOQorcp6J9WC5nW7 Vv86z6gGCRM7XBBTNBxQU+hEaOg3WQfl5Y/AqkjEKVKq8oNbJaGQ8ZwOYp6lzr33k1XaYYd9xId P9VKcNiuIhiU+ljMKwzec1scpNPUBylSUEoKuNuvfPSl0U94Of41z4gvFz1vr+wFLZNNQengemg T/DBrkbUlD3oHshcZkIXLnPJGrIoRlmChZWtrI6yF/JYdnBzzFUXh6NgAh X-Received: by 2002:a5d:5e01:0:b0:480:c5:d635 with SMTP id ffacd0b85a97d-482f782a4a2mr34636140f8f.0.1788170515229; Mon, 31 Aug 2026 03:01:55 -0700 (PDT) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Cc: den@openvz.org, qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 1/6] io/channel-socket: do not treat a zero length write as an error Date: Mon, 31 Aug 2026 12:01:46 +0200 Message-ID: <20260831100151.914178-2-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831100151.914178-1-den@openvz.org> References: <20260831100151.914178-1-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=den@openvz.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @openvz.org) X-ZM-MESSAGEID: 1788170562863154100 From: Denis V. Lunev qio_channel_socket_writev() checks "ret <=3D 0" after sendmsg(). A zero length iovec is written successfully and returns 0, so the success falls into the errno switch, which acts on whatever the last failing syscall left in errno. A stale EAGAIN turns it into QIO_CHANNEL_ERR_BLOCK with errp untouched, and a caller which treats every negative return as fatal then passes a NULL Error to error_get_pretty(). The websocket handshake does exactly that, so an unauthenticated client crashes QEMU during the greeting. Returning 0 is safe for callers which loop until everything is written. qio_channel_writev_full_all() has no zero progress guard, but iov_copy() yields no entries for a zero length write, so that loop is never entered. A connected stream socket returns 0 only when there is nothing to send. The WIN32 implementation in the same file uses "ret < 0". Fixes: 559607ea173a ("io: add QIOChannelSocket class") Cc: qemu-stable@nongnu.org Cc: Daniel P. Berrang=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Denis V. Lunev Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- io/channel-socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/channel-socket.c b/io/channel-socket.c index 12773b832c..7920cee639 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -667,7 +667,7 @@ static ssize_t qio_channel_socket_writev(QIOChannel *io= c, =20 retry: ret =3D sendmsg(sioc->fd, &msg, sflags); - if (ret <=3D 0) { + if (ret < 0) { switch (errno) { case EAGAIN: return QIO_CHANNEL_ERR_BLOCK; --=20 2.53.0 From nobody Sat Sep 26 20:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1788170586; cv=none; d=zohomail.com; s=zohoarc; b=X2+OY2bapPHUIYDdRyLaKmQp/kYr23PBMP0pfnYLLftbXknjWDYchylhuueLiJttRbdbbzVZSHWXjQwoHcu0bfPJvh/g49O6jC3weEz82EtaZGKEZhiZIaIcAuOq2aZZYnMZ5sedsMPfsz50FQXdg1gS6P0iAAJM/BBcCpAa/s0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788170586; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5l+A4VTVItQEGlaBGwJQQDrMFIhfMZArZo9il9USUm4=; b=HKZgXQzAMz+amxklbhuOB2iNhM9wKoGmXv9ikN6Zs5eRdRItM5fy8CFObXbGnThgKhOEawVElmWjY/gLKjPKhhP98MPRLxiktSYaPeEUuI0w0mcJqgvzRBzNxFbxdzUlieNadcBWS6eAgMu+HsnD3HUkkCjzqBuKQzQ235PNUsc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788170586829467.74139516161074; Mon, 31 Aug 2026 03:03:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x0yqM-0003cM-KX; Mon, 31 Aug 2026 06:02:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x0yq6-0003ZV-G8 for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:07 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x0yq4-0001j0-UK for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:06 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-482e4998d28so2249666f8f.2 for ; Mon, 31 Aug 2026 03:02:04 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:3bc1:c53b:30b:203e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482fbb33070sm22362383f8f.36.2026.08.31.03.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 03:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1788170523; x=1788775323; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=5l+A4VTVItQEGlaBGwJQQDrMFIhfMZArZo9il9USUm4=; b=qHiytBV9XtsJKBt0OQzrFlnydW7/SI4lM6fvYVbwUnteB2hu5onPh3tc3wGKpFRhc1 tkwHKVNsZW0NmVScP/PBJk8bSlM0UzpK44Gh+swaH/YjGLjK+eZOMqq3gWbtb5Q4dfsC 23DnoIbzIx+XZt5lfT3w18X2Rf4paeIhyYtWQJ0kCQRNZwQcO9ZcE5JB145pkiSDws3z hlOoa+by0W7APxFIZ4fp9UQPxJpI+O1RdKMVfPnNNfTUpj0B/0xunOfGZvWg8TghB4Pw RYbIRRk1gf4xqBDNWk1Km1xeBLPqpApY7Mu/Z4ZBQs1a4lfvqMAfQSZhdZBuWUbYGR0P mbRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788170523; x=1788775323; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=5l+A4VTVItQEGlaBGwJQQDrMFIhfMZArZo9il9USUm4=; b=IVsTP5cDPTVx7/d7KgO5Am79aqGgenGUvQ9x4XDDAhBwb8OCzWYSPDgaodl+6leAf6 ECF5FodaK9uMY9uAsEJQ6ruE4pm/oXXu4dNb0KUwcjPREn1HxRcHb0pa584bhwnsUnwD QXgACIEcN68phculrz3vROaNMFqW9PmPyQGZm7CoSZ84hQ9zFMmJYy9JtvHmv36+Osse I067VyHlDbS/rKVUTH78rF+uF6E7VJy/7qYHewJKwWh4EYbzQTl8nkVfL7/d3EkyYaH9 2hdnL9lav4kcbRS6X9+LFDPkGah8oo7EtVz3eUQbEF8gbHX00oLs3tMKe6f023vZ6C1i xWaA== X-Gm-Message-State: AFuF++mp/zr8SNgRZIJkdONeZrGgTXzGtC8gzck8a7hi0pcBnan8xwbV XvbBeMhywc0BCR1EB32TrQhqEv+vLpe72fsLH0YTg4zwLywcCZyHwT07OLQjf0VXRjyksvwOxL8 ONCim X-Gm-Gg: AYBFou1pxXAe43GjzB3SKGpnTLWtMX3Zx2ZycMpGjpMgPN5bJ4PIddjxm8yLOZAVVM7 FVrEZNm9pF/AoqtVNOUO33aIg99zOcnyEY63iP8Sv7DosKMGlA9VUS0nX+SgFHDDzeYopcN+HFR OgY/yl16mONjIMpn2pwnSEn091CJwIfKqcOJuJY3su3izhMcRxeCzizqa2uGoYY5+wq3th8W+4K NIxCL+WOqFnvw+a4UznIS0iByioSbKbidw8/BP18ZjNVJaPKDm5G3MHMqdddCOGBKtpPQodJGop QRKo92yy6tEUmSoz0sL53WXKNme3EoJLHrnNHoy7lU2TyaqQUTNmfenQYNpf9YQH9k6xftiQdUh qZirygFKEe4azXc7KgFmlfGNO88GAWF5PBjTm30TwiDSep7uTusj/VRJysI2skRPJJlC8+hMA5j jayxvP1Dbz7jKmG4BcdRznX1VEpHRLR4uGB385yOC6QgGmyo7kEACtY3JV X-Received: by 2002:a5d:59c6:0:b0:484:3d1b:7884 with SMTP id ffacd0b85a97d-4843f442224mr2540352f8f.17.1788170516299; Mon, 31 Aug 2026 03:01:56 -0700 (PDT) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Cc: den@openvz.org, qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 2/6] io/channel-websock: send an HTTP 400 when the greeting has no space Date: Mon, 31 Aug 2026 12:01:47 +0200 Message-ID: <20260831100151.914178-3-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831100151.914178-1-den@openvz.org> References: <20260831100151.914178-1-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=den@openvz.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @openvz.org) X-ZM-MESSAGEID: 1788170589037158500 From: Denis V. Lunev qio_channel_websock_extract_headers() returns 0 without queueing a response when the request line contains no space, unlike every sibling check which jumps to bad_request. encoutput stays empty, yet qio_channel_websock_handshake_read() still reports success and the caller arms a G_IO_OUT watch to flush nothing. Flushing that empty buffer is where QEMU crashes. Any client can trigger it before authentication on a VNC websocket port: printf 'stats\r\nx\r\n\r\n' | nc $host $port Fixes: 07e95cd529af ("io: fully parse & validate HTTP headers for websocket= protocol handshake") Cc: qemu-stable@nongnu.org Cc: Daniel P. Berrang=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Denis V. Lunev Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- io/channel-websock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index 1929abf56a..66c91ed2a2 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -230,7 +230,7 @@ qio_channel_websock_extract_headers(QIOChannelWebsock *= ioc, tmp =3D strchr(buffer, ' '); if (!tmp) { error_setg(errp, "Missing HTTP path delimiter"); - return 0; + goto bad_request; } *tmp =3D '\0'; =20 --=20 2.53.0 From nobody Sat Sep 26 20:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1788170607; cv=none; d=zohomail.com; s=zohoarc; b=OgUo5FNVcewyLdW+7WUMwQj8LRbp2bud3HdbVkxlEN4qLm5ia8CKmyx1L+GfpQxRfBnZekZKLI/+I49k488GiKhwWvcXOZXpGKxEbtTR3vhRErII9p9D4zFZse4N03hafAHIRWco+4FhESyc3Dm/hecbLRTc0fL1mtfBUM3GRM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788170607; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OOj3UJv01tlBH9pWB45VmW3UUOGqsvmi2BentS7bMfE=; b=QW6p6exK77Ach08aPo1FMeX+yL5NKDzpfjkNPJmG1lEo5V4jMlWzgdcdTHQLQGajeJyN1fj1Nm8EP7G37806BaqZGTeGSuEwFBdLeVSMhwR4My0stdZ5rs49j4OD22tuuxMXQ02+Zpche0+iFF8z9+LpcPoC0f3gx+wRuWi7GtU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788170607509276.939016017373; Mon, 31 Aug 2026 03:03:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x0yqL-0003bu-V2; Mon, 31 Aug 2026 06:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x0yq0-0003W8-KE for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:00 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x0ypz-0001ht-2P for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:00 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-47de0093c42so2923668f8f.3 for ; Mon, 31 Aug 2026 03:01:58 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:3bc1:c53b:30b:203e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482fbb33070sm22362383f8f.36.2026.08.31.03.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 03:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1788170517; x=1788775317; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=OOj3UJv01tlBH9pWB45VmW3UUOGqsvmi2BentS7bMfE=; b=eNx7SG70RnDUsql/c772eORa5BvCacYiA5Iz2IuNAhVrciqEw0zNeiHotrFsB3q1dI sN92pUfKN3ViWN0hg6ckSnyVU/ZT/WeU2SYxq1lltBQv+BeXg99QDzpviJzmIEAKuSMf 0bWKxS/Tyjh+Om8p/gElV8bfcpEB+ByjV47o25P/Llu+01rcAJVQe/P2VOAXyviYzNrG WFrX8a+YRG0DF2Y0fJtFMrUdh4UjAAQrD+/4QF5rau3EswbUjmR0908FFwrLC2zfdKDW l/X5INt1u6OAAwD5mQ/r44BduRIC9K/1o9w6EnWiMfxqkcaKix8zqQA3n6BRDZdO1hvU Ax4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788170517; x=1788775317; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=OOj3UJv01tlBH9pWB45VmW3UUOGqsvmi2BentS7bMfE=; b=mRIKPw1wzbbf6Ck8aEmylXZZfVIBDCEC7lezdmllwIDcJ2i2b6J+rIhJb5k+RBh5MC JtgK+sF/uNGg6NMkYQhJyULH3ycCHCyCNjWob0rk3AhEF0aJqg4N6hBHqt7D/8TOAa2T O8GtbS8aZi77Bb8b62TeeDHscvNiNJwe6GBBMY2KeJThKUBn1akDFUNacSFJ55JJ5Dnf Wq4Ux3uo6IXeD9xSqi9QB/MV7Tcf2DPrfb1IlUNZb7haX46opwRM4GuCSozecDPibBT4 faJuuKMC+wNUybrNaKMB8rIU5TFwskc5DrT36lVq6RYdTWF9bxC2/paUcUzTuUejehML VdXw== X-Gm-Message-State: AFuF++l3gYcRfnw8QZgXvTDaLw9wVRkDSbzCng5YNXleIkgGvhibZ6R4 l3cy9uyJqfJxDzWm7XtKVtrv4G4FMTNby5razfH36ERkacoPX0+A1DLX0VJ250G1GxGhai6KfIo HUAb0 X-Gm-Gg: AYBFou3FJ7BAOWuUjyJvRnDQLeXcv9TY8HykGvcqfruHFxu1v+7QZV814MhhVFbiAyq PTCjdHKviQjP4/lxV8Bs9kp/CPFUgNS4XDHAoqOHOI7xnFGl8aAeEPlpOxKy6W/R36Wy6zFOAFw 2+Hneqrr4HNpUQkHWF1HucCgljS3D0an8JK8UU1OPoLDyOmlXFcM0JSa3hZDG5iVR+hsjKYp4Xu wH2XdNxWfX/U+ztOEFwuRal3Q5XEFse8MT/Pn/+UPdZAVxMuIJoFmLWuhNIEgnK9yXt/z7ZjfAF Kd/ahr9ewxdWFBPGfPwMQW659X1vlXYldBPJ/d0SJQ2Rrk8Cpcg1qhKB4+ZHLUD2rqKvCYVHf9v 4IdqK5SeXWM8XqfnOo0nGp6PyEiA6Lghp1LWzB+OGI7dhw7mcrLNwkyVabWjLRUwghLk7HIh5eu FHFigrxnhh6iaUsgl/S5C1irGKJbwVJvsDc6rHH6ZL+NZTFo673X/eAsEp X-Received: by 2002:a05:6000:4715:b0:47f:c648:e265 with SMTP id ffacd0b85a97d-482f79bf064mr43460229f8f.17.1788170517324; Mon, 31 Aug 2026 03:01:57 -0700 (PDT) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Cc: den@openvz.org, qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 3/6] io/channel-websock: handle a blocked write during the handshake Date: Mon, 31 Aug 2026 12:01:48 +0200 Message-ID: <20260831100151.914178-4-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831100151.914178-1-den@openvz.org> References: <20260831100151.914178-1-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=den@openvz.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @openvz.org) X-ZM-MESSAGEID: 1788170609289158500 From: Denis V. Lunev 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") Cc: qemu-stable@nongnu.org Cc: Daniel P. Berrang=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Denis V. Lunev Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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(QIO= Channel *ioc, wioc->encoutput.offset, &err); =20 + if (ret =3D=3D 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); --=20 2.53.0 From nobody Sat Sep 26 20:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1788170561; cv=none; d=zohomail.com; s=zohoarc; b=PIe+BEBkPZQ5GEGNWQJU3IS4Dnwv00FoOGoT0YhzL7JFIkC+WIEesKBdg4ZZosI8nvxKv835hI9D8AUjA0lObMr5HdGk76oeFlTUIpFJ3ou+I56ozz7Eq/f1dUzOcF/yGh3cMcJG9pz2u1/lZ3ZuvqYHOmAWzEBzxlDj3XS5p1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788170561; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oCneUgH+VCGYg++9em8cPDWbXKgq959i6BrsDRTpNpA=; b=byQSzK5sL7htfejiOM9/aGiiFvFQ4ZOhntFnd/6kbOG5Zf/700InTeF8R8Q3RRmPD+VzP0oSzwFIqiPIecBUTsNelu+drpsqE8Ejz5P1fgOZsYBvPGta+pIX6L9t7TdSE376v+/NgZ+1M+ES3FhxPg5Ba7w1Na4e8UW76sgjJMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788170560974341.1549772330018; Mon, 31 Aug 2026 03:02:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x0yqG-0003aw-0e; Mon, 31 Aug 2026 06:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x0yq1-0003XA-Rz for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:04 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x0ypz-0001i8-Ux for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:01 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-47de0093c42so2923688f8f.3 for ; Mon, 31 Aug 2026 03:01:59 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:3bc1:c53b:30b:203e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482fbb33070sm22362383f8f.36.2026.08.31.03.01.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 03:01:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1788170518; x=1788775318; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=oCneUgH+VCGYg++9em8cPDWbXKgq959i6BrsDRTpNpA=; b=jK73X1CrMBQK0Kfgy3M7pzXh6ZAJEctpCtaWghFmQs2Z8kNfxvrSXL5W6nrF9skLhl LKjvouie57I4xRXKD9SMzJX0vVua75rkKKVTXnqme5TC8Ur/sH9L34h+bMEclUUQpPsU Tu09zUpC82rSO1s6FnpMqoeHYUzQg0O9AOfO9fTJeQ7rvIqPsB1xrTjj4qHw0TrHl5sQ qVvGS50Ty1bTRZVLErUXZzOS0fmm7Ij0Qlu+UpaEjUuVP0A/vDZX+1ip0OBZDi17RGNH P/qS660Rew80XiObuGOiRX45OYHP/azKwVmkbO24A8RPWOjZS0mDlmP1jUmK61ujMlYa Ktbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788170518; x=1788775318; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=oCneUgH+VCGYg++9em8cPDWbXKgq959i6BrsDRTpNpA=; b=WJEM9c5v2ScJkbr0M9hP9vxT8MB87XseQ48yIXzr+573MHr8gLkVkl2oZdUciPjxwj icxOhPqbJGG2x6rutrZIk284TamIfp3GVa3GfMSyIxrtIvE7USTIaaNk6QTd0I4d7bGU 76lm5jUan0Q1dLAfCvmuD/a5gaVDBdvETeiUO9w6YtHOSZf28G7xjt2ibpk23xL0oMCF KGZt7xSOs0+FOanWNKCp0icK01HE1Ff26FEz6DIg1UZHJiBD7QW2QkYQtC6NX5U4F4bY 0SNzVqLJw72uwrq/RmpJ5yNRtqB+3s47rnWd1CRi/uoP50wt9USaTGu2CQCqLIv7uA5u XF3g== X-Gm-Message-State: AFuF++nzadgiVsm8PV1a+jz4+5GnoNQD6ji9EPrDdRwoUgJuH1ZGPtwX qzH7v3YBLMBV4jxUXETDIBiw0o7hRP8MrYwXY2GA7QZpxeiQZ2RrKJxqYoOukmSw2AebiRZPms/ fyKpw X-Gm-Gg: AYBFou1xNGWf6IiFA1q2tHF9Y303IHQbpSL8bV9X1ZRGtOQLNWulfxRxPLaIww0BEk4 AsX/dBFNR/yn9qy2cKMK0uReDEqXP1ySq0Ia2BAswnBC3aNfkcm2YoQYr9WUfDJWSKaZ3la4i+L tDQot/QHrhQ9gL4duFTAQmJ2zI9FulIIhE8Dhm4KwQqmZxknHyWWApwqARY/9gPeZ/x/1YQVvJ+ H61sDXv390Kc3F6eFyGzCm5PXCi0SLswv3BfjWInYIn/2UUOUyfwKU/8hKJN5pqgSe3WFUQwnZ/ uqru+gh+lbeRCvtSthlf8A6AijB51zXuuFkaZSmvC8DiJbRI+vk6gQV5TDKRiOUBLi7gAjjczVA VDa/DBnLlQx6O8Vx8lNl+3qejFpBeHdkE1E/U/0hY7O5M4RyFDeiK6Hw2eTCSvHZu2HOrgSgrf0 n9FomyHzC2vfIzWIXAPZgvHlcu0UioppEMR25Yi1hUyLiBw8NpMKELzP8g X-Received: by 2002:a05:6000:1449:b0:47f:fb2e:f63d with SMTP id ffacd0b85a97d-482f79859b9mr34002720f8f.9.1788170518482; Mon, 31 Aug 2026 03:01:58 -0700 (PDT) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Cc: den@openvz.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 4/6] tests/unit: add websock handshake test Date: Mon, 31 Aug 2026 12:01:49 +0200 Message-ID: <20260831100151.914178-5-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831100151.914178-1-den@openvz.org> References: <20260831100151.914178-1-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=den@openvz.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @openvz.org) X-ZM-MESSAGEID: 1788170563473158500 From: Denis V. Lunev Check that malformed HTTP greetings are answered with an HTTP 400 rather than an empty response. The no-space case is the one which used to leave the response buffer empty. Cc: Daniel P. Berrang=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Denis V. Lunev Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- tests/unit/meson.build | 1 + tests/unit/test-io-channel-websock.c | 105 +++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 tests/unit/test-io-channel-websock.c diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 3a9866c1f2..6a11f07112 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -93,6 +93,7 @@ if have_block 'test-io-channel-command': ['io-channel-helpers.c', io], 'test-io-channel-buffer': ['io-channel-helpers.c', io], 'test-io-channel-null': [io], + 'test-io-channel-websock': [io], 'test-crypto-ivgen': [io], 'test-crypto-afsplit': [io], 'test-crypto-block': [io], diff --git a/tests/unit/test-io-channel-websock.c b/tests/unit/test-io-chan= nel-websock.c new file mode 100644 index 0000000000..2a55a4bcdf --- /dev/null +++ b/tests/unit/test-io-channel-websock.c @@ -0,0 +1,105 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * QEMU I/O channel websock test + * + * Copyright (c) 2026 Virtuozzo International GmbH + */ + +#include "qemu/osdep.h" +#include "io/channel-websock.h" +#include "io/channel-socket.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "qemu/sockets.h" + +typedef struct { + bool finished; + bool failed; +} QIOChannelWebsockHandshake; + +static void test_websock_handshake_done(QIOTask *task, gpointer opaque) +{ + QIOChannelWebsockHandshake *res =3D opaque; + + res->finished =3D true; + res->failed =3D qio_task_propagate_error(task, NULL); +} + +/* + * Drives a server-side handshake against @request and returns whatever + * the server wrote back, NUL terminated. The handshake is expected to + * fail; the point of the test is the HTTP response that goes with it. + */ +static char *test_websock_handshake_reply(const char *request) +{ + QIOChannelWebsockHandshake res =3D { false, false }; + QIOChannelSocket *cli, *srv; + QIOChannelWebsock *wioc; + GMainContext *mainloop; + int channel[2]; + char *reply; + ssize_t got; + + g_assert(qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, channel) =3D=3D 0); + + cli =3D qio_channel_socket_new_fd(channel[0], &error_abort); + srv =3D qio_channel_socket_new_fd(channel[1], &error_abort); + qio_channel_set_blocking(QIO_CHANNEL(srv), false, &error_abort); + qio_channel_set_blocking(QIO_CHANNEL(cli), false, &error_abort); + + wioc =3D qio_channel_websock_new_server(QIO_CHANNEL(srv)); + qio_channel_websock_handshake(wioc, test_websock_handshake_done, + &res, NULL); + + qio_channel_write_all(QIO_CHANNEL(cli), request, strlen(request), + &error_abort); + + mainloop =3D g_main_context_default(); + while (!res.finished) { + g_main_context_iteration(mainloop, TRUE); + } + g_assert(res.failed); + + reply =3D g_malloc0(1024); + got =3D qio_channel_read(QIO_CHANNEL(cli), reply, 1023, &error_abort); + if (got > 0) { + reply[got] =3D '\0'; + } + + object_unref(OBJECT(wioc)); + object_unref(OBJECT(srv)); + object_unref(OBJECT(cli)); + + return reply; +} + +static void test_websock_bad_request(const void *opaque) +{ + const char *request =3D opaque; + g_autofree char *reply =3D test_websock_handshake_reply(request); + + g_assert_true(g_str_has_prefix(reply, "HTTP/1.1 400 Bad Request\r\n")); +} + +int main(int argc, char **argv) +{ + module_call_init(MODULE_INIT_QOM); + g_test_init(&argc, &argv, NULL); + +#define TEST_BAD_REQUEST(name, request) \ + g_test_add_data_func("/io/channel/websock/bad-request/" name, \ + request, test_websock_bad_request) + + /* + * A greeting with no space at all used to leave the response buffer + * empty, which drove the handshake into a zero length write. + */ + TEST_BAD_REQUEST("no-space", "stats\r\nx\r\n\r\n"); + TEST_BAD_REQUEST("method-only", "GET\r\nx\r\n\r\n"); + TEST_BAD_REQUEST("no-version", "GET /\r\nx\r\n\r\n"); + TEST_BAD_REQUEST("bad-method", "POST / HTTP/1.1\r\nx: y\r\n\r\n"); + TEST_BAD_REQUEST("bad-version", "GET / HTTP/1.0\r\nx: y\r\n\r\n"); + + return g_test_run(); +} --=20 2.53.0 From nobody Sat Sep 26 20:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1788170579; cv=none; d=zohomail.com; s=zohoarc; b=aN1bzQ85MjuBODkF2WpAzc6ECitc5I4T0grNUqe9P5JEikJpwL/aAGcmzDlCG1gfNoRn+f2U3k9MUwe3dokXz9GBsLXEhrfT1vKwujE9Ih125HM40RgCNbLv0gag+JYt4udEuswTjY+9YfR3UXBCglHq5YKF4BvP0AICBvR+m+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788170579; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GHAHiovpLjpMgWslVL+XHpRGl2nzxx+x3noQBuDkJ5M=; b=D3KQLyhjakqLwKLeWHODAPSarB6d54TT7obcXs4FXWfJh0kuY0wfcCoqlfAhuNInsC2Na16PdVePRtKktry7QDZa9VB00Gl4lqlpUq7Nf9lVG2lm7j+H0KAANQfbGb5zCNaUKGRFVI0cG/PmszqpY2wzM4P7Z2NUieNH4xGA0lc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788170579055361.0353010280984; Mon, 31 Aug 2026 03:02:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x0yqL-0003c3-Vd; Mon, 31 Aug 2026 06:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x0yq2-0003Yx-WC for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:05 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x0yq1-0001iI-BB for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:02 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-c1677c91969so305064666b.1 for ; Mon, 31 Aug 2026 03:02:00 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:3bc1:c53b:30b:203e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482fbb33070sm22362383f8f.36.2026.08.31.03.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 03:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1788170519; x=1788775319; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=GHAHiovpLjpMgWslVL+XHpRGl2nzxx+x3noQBuDkJ5M=; b=bRmQ/aI8ze03/oV9NaD81pLniklLOIhJXZS8QqHmQNHjJPpG8nU2FzdIBdZ4GvPKoL 6b/BZUAmDZeEKVcM9G97WoMB1HzelXNVXhgDBf0ePEggdp/+95cZjLsYXbm7nRfTAI57 YEpj50f5DwADxYGtauSWPMuo29hNMl5zb+dgMxBfF3qCFqEjk53ZB/2WSeEavYdIZJpW FjNayCYlJ/4pqfXAl81Gd9v6JzHsRO4XbzfJ3F3GxqnCn+h2Bkx5rg6ph4O/mnnkeVEN 0sUJ7EOVvJZvSszAarw9k53PrtDcHGtw7j64FbQ8/TNrvGF5RPkovRolyW9EpVoA5piW aCnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788170519; x=1788775319; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=GHAHiovpLjpMgWslVL+XHpRGl2nzxx+x3noQBuDkJ5M=; b=dI/Mm8LQqOefliOXHY8wKKUl3+YkraVa3Z1di19NJBZWRZ2U3dgaZe1Ao2ktfVg3vO Wx7jGpb4bKj5LXNC+0JNV7/5ZIHlU8SoKdbc/odbeLLtrhga45r9WFjcqHechTSAhEKK c8sYdQXHe2lhbbi5PKWR4t3nWwAwM/TrKM6yXWSvPv0RG8MVGZVORNjAiZJVpCTS2Kma Rt29Ixc1pmWotQ1ujiUhaowmCyJ6l+fO9E7DlSi77msPJjOFRWmttgHRvQBM0tVls6co g2E66qrDvt5FjtyKp4FqfPOzoXOkygwE8GjW7wMV9hy9Hza4Lzgc00GPB2nKCVlCypme u/Pw== X-Gm-Message-State: AFuF++nkQ92WYrPqCFReKk7cbq63f8VyZ83JWeKsci6v1hxkNoth+7yC ufYZwLPbLZCfK6WgaaKfKXCKoEEepJ3+VeVRq/YH39lFETF97xB9AqOGVJwPZ/vYIax31zArxKQ qEm+A X-Gm-Gg: AR+sD138zDrkRiQ3OsVRMEXaIyAwgZNnVpCDYJlNPGivR38x+a382iVKqb5J+GKQffz +08qOAutobN8AfOPjup0Ol80p0e72zNDx9FTIPPrckIbOTWK2mivCNR8kTJ3QXUml3UyQZvCIEL +Temx9TUK75DkcpwoMybUidLxb957R3C5TnsFCbOfKJVPaizpBbdMk3QDUgkWLjrGuErZ9U+Ls7 kYomq8uaJrv13NiDXKYTmTptmP9wL3aKzctavJIgPYFExPLWHM199uX3VhFAyAMd+8Lbh2BFe5O 8GMAHqQDNGqxx5D33AzoBivJNBkbjXqpGEX+uOEpty6JUVrwKdfZmbjEeDtzdr+Gs1Qc5lo7Ouk h/fxHYUCeUtK0nk1cNiBRxb9piEMVDBSzcX/7rcGvelR2RCWpNt9cQp6FoVggYgYtubXR4+eVnl pnFoO5pwDacCs7S4X87uarN8OV4z4oChLsFTHlmh1DdENQG7yGTOOr+Pzg X-Received: by 2002:a17:906:7306:b0:c1f:1520:4de5 with SMTP id a640c23a62f3a-c2556be194dmr1620758766b.1.1788170519514; Mon, 31 Aug 2026 03:01:59 -0700 (PDT) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Cc: den@openvz.org, qemu-stable@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 5/6] io/channel-websock: do not lose QIO_CHANNEL_ERR_BLOCK while reading Date: Mon, 31 Aug 2026 12:01:50 +0200 Message-ID: <20260831100151.914178-6-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831100151.914178-1-den@openvz.org> References: <20260831100151.914178-1-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=den@openvz.org; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @openvz.org) X-ZM-MESSAGEID: 1788170580887158500 From: Denis V. Lunev qio_channel_websock_handshake_read() folds every negative return from qio_channel_read() into -1. QIO_CHANNEL_ERR_BLOCK leaves errp unset, so qio_channel_websock_handshake_io() then hands a NULL Error to error_get_pretty() and QEMU dies. The master channel is non-blocking and, for a wss:// client, is a TLS channel. A G_IO_IN wakeup carrying only part of a TLS record makes gnutls report EAGAIN, which is all it takes to reach this before the client has authenticated. ERR_BLOCK here means the headers are not complete yet, which is what a 0 return already tells the caller. Report it that way and keep waiting. The watch is level triggered, so an incomplete record sitting in the socket spins the main loop until the rest of it arrives. That is bounded by the round trip and is what every reader layered over TLS already does. Fixes: 2d1d0e70cf3e ("io: add QIOChannelWebsock class") Cc: qemu-stable@nongnu.org Cc: Daniel P. Berrang=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Denis V. Lunev Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- io/channel-websock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/io/channel-websock.c b/io/channel-websock.c index 8f27b1f12b..461abcae48 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -492,6 +492,9 @@ static int qio_channel_websock_handshake_read(QIOChanne= lWebsock *ioc, buffer_reserve(&ioc->encinput, want); ret =3D qio_channel_read(ioc->master, (char *)buffer_end(&ioc->encinput), want, errp); + if (ret =3D=3D QIO_CHANNEL_ERR_BLOCK) { + return 0; + } if (ret < 0) { return -1; } --=20 2.53.0 From nobody Sat Sep 26 20:50:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1788170566; cv=none; d=zohomail.com; s=zohoarc; b=i2Nz6SyTVjQ9QDPajqBlC4k4jyQncewFz2sN+jC+CxR6DVEhEn1up73uWGHMldQcGYYhiatWIiULBvm1uKTVQVMmNLn36WTc28OileFs6hetvOy5m/TdtANnkgiOPLYvh4m/VytR2XMt+d8ZU4NrT9RoXbUj+KL1hwgp9vJjR1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788170566; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=23CFRW4wlT4KTlZB9/d9F3Ig9fE0VudgUIy5XUnsxBQ=; b=dTkiz2PnaRv2ToR5IqtBSbF8KrmU8AzLBk0g7p/gXompsJe2HvCtO0a2Se8BLcbfGiJUW9W0KFmPEo84bsn+WiyhrTqG1JHsT57IZK5TRAAU+Kc8fFfRi+jzxfnKsLnwMLpo5csJr+ateOUrSRHsHFTLnXO1+5a8KahjzJfvHz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1788170566225246.89209954618264; Mon, 31 Aug 2026 03:02:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x0yqO-0003dZ-QA; Mon, 31 Aug 2026 06:02:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x0yqG-0003bR-E7 for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:21 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x0yqE-0001jX-FF for qemu-devel@nongnu.org; Mon, 31 Aug 2026 06:02:16 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-482f2ee53e7so1462229f8f.1 for ; Mon, 31 Aug 2026 03:02:13 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:3bc1:c53b:30b:203e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482fbb33070sm22362383f8f.36.2026.08.31.03.01.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 03:02:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1788170533; x=1788775333; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=23CFRW4wlT4KTlZB9/d9F3Ig9fE0VudgUIy5XUnsxBQ=; b=iCc7EWy/YNCZmUBcKUJVj+AifO11EFRMUQt6Qzi0Swng6tMokNaH7r/GWBQflNbSsf Fsjpwxu28ki5de1Rmamoeo7fkOAP454xNS/fnFLJZjISnhdcgivBT5HQhq4R0Md9zs+H uMSq23mgVZYQdVaoKRVOFzfGMNjI/oosdtDzTeVbYfgyyWysHVRghB7GeP6Yu6nl3VqI uKR3xw4FQ8WK0TumD03IjWvBAFxuW3hXvzhh8Mz/2FO5pRTZAy+/Mw9aG1jLc12pI8K/ JCBOyE0LVV67PuwLXbFZOr9YGDWZv0Aqzf4Csd7nudUGt15HHT3ghSqWerJ2gBfjabSn IQSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788170533; x=1788775333; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=23CFRW4wlT4KTlZB9/d9F3Ig9fE0VudgUIy5XUnsxBQ=; b=YJAd90DSbpmFHTJQXnOeIM5ZMazP+pcqIChgOiX3R9HZH+zv13dcPQ0Dy7WwZGeigA 6jK1Ti7Ch3pboP5jHoLELuMqPAkM2ZL9lK3svYVRa35Yri0QtMcgDxgUywYWuI94MbP0 6NrDZyovfSqGeu+lAX8wPkwl6Y3TIkU7ZEF6HqqJHsmOsWTTepw5friUdSewgZfD+pbO Bj9KFIP8l8NbSvZZnatUreY+Uf2tNeqpMh1BFVQCmojFtD3mvRBll0ttxx33LLaJtJGI N6Flr9eIha8zIqMVDynozLC2LgsY2nOUxbLzvqHncvyRX/X3fdJUYBwbwzFG46Ny1SgU Zgfg== X-Gm-Message-State: AFuF++mrQxIjwegXmLlXANBMbCKSESJ46PRfV8obXzimZc23e3PYwkbW 9xqMeEN1LvF46DuMkgb1BABDpCR+v0UOgewb4jfRFxfEvJqCCtPh1m3JuuLYNbiI/TGNMTFAfIo LswUu X-Gm-Gg: AYBFou2mXIcdhTi8qaf3YwCVxd2m3/UZwGd9b/f+2ykMThPB8PRAEK76KLUTpeyJtDo uofAESyC71tIfNYruZvyJmcuXhCcSvDioYFyaRhn7ig8ZAeXUWx6YLhLpREphlsfnLmIODuerVq cYcSdAyuoJbY/KqkLO+WA1ZOJxhnK4LmMzgZp+6vw220iY/Hz14skue6YGMHyalEbQAUYEiHOYe uMfIHFQZxr8UQIe3pJPaBoiYcm+iw/4m2B0MLTeSxgU3r8V5Fim/zuIbfHj+KdY9JePCB6n6zaL OFlokGxm8G8/DdRAdCvnaDqBQGhdDIxybpKU1J68wWqpwKTqJLMjD1Ifa/1gAx2Z6X5vVQbMoED S6ASACcGXiC9d73YH98LdYQvYFMgRptgoCRLObX48nX1c6Ila4mf1j1ndQibFz20Vf+CXtjLd2P 2OhtA9s5cDJhLCMAPfD6fsGf/J1Lie+HtUPhWrVK7NegYkKvSghXqXY0/7 X-Received: by 2002:a05:6000:4917:b0:482:9dc6:16c4 with SMTP id ffacd0b85a97d-4843f894ce9mr2039089f8f.1.1788170520472; Mon, 31 Aug 2026 03:02:00 -0700 (PDT) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Cc: den@openvz.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 6/6] tests/unit: cover blocked IO during the websock handshake Date: Mon, 31 Aug 2026 12:01:51 +0200 Message-ID: <20260831100151.914178-7-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831100151.914178-1-den@openvz.org> References: <20260831100151.914178-1-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=den@openvz.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @openvz.org) X-ZM-MESSAGEID: 1788170568149154100 From: Denis V. Lunev Add a channel which reports QIO_CHANNEL_ERR_BLOCK on demand, the way a TLS channel does when a record arrives split across segments or when the socket cannot take the whole reply at once, and drive the server handshake through it in both directions. Without the fixes each direction dereferences a NULL Error and the test dies on SIGSEGV. Cc: Daniel P. Berrang=C3=A9 Cc: Marc-Andr=C3=A9 Lureau Signed-off-by: Denis V. Lunev Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- tests/unit/test-io-channel-websock.c | 150 ++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 3 deletions(-) diff --git a/tests/unit/test-io-channel-websock.c b/tests/unit/test-io-chan= nel-websock.c index 2a55a4bcdf..88da24f993 100644 --- a/tests/unit/test-io-channel-websock.c +++ b/tests/unit/test-io-channel-websock.c @@ -12,6 +12,123 @@ #include "qapi/error.h" #include "qemu/module.h" #include "qemu/sockets.h" +#include "qom/object.h" + +#define TYPE_QIO_CHANNEL_STALL "qio-channel-stall" +OBJECT_DECLARE_SIMPLE_TYPE(QIOChannelStall, QIO_CHANNEL_STALL) + +/* + * Reports QIO_CHANNEL_ERR_BLOCK for the first @rstalls reads and @wstalls + * writes, the way a TLS channel does when a record arrives split across T= CP + * segments or the socket cannot take the whole reply at once. + */ +struct QIOChannelStall { + QIOChannel parent; + QIOChannel *master; + unsigned rstalls; + unsigned wstalls; +}; + +static ssize_t qio_channel_stall_readv(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int **fds, + size_t *nfds, + int flags, + Error **errp) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL(ioc); + + if (sioc->rstalls) { + sioc->rstalls--; + return QIO_CHANNEL_ERR_BLOCK; + } + return qio_channel_readv_full(sioc->master, iov, niov, fds, nfds, + flags, errp); +} + +static ssize_t qio_channel_stall_writev(QIOChannel *ioc, + const struct iovec *iov, + size_t niov, + int *fds, + size_t nfds, + int flags, + Error **errp) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL(ioc); + + if (sioc->wstalls) { + sioc->wstalls--; + return QIO_CHANNEL_ERR_BLOCK; + } + return qio_channel_writev_full(sioc->master, iov, niov, fds, nfds, + flags, errp); +} + +static int qio_channel_stall_set_blocking(QIOChannel *ioc, bool enabled, + Error **errp) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL(ioc); + + return qio_channel_set_blocking(sioc->master, enabled, errp) ? 0 : -1; +} + +static int qio_channel_stall_close(QIOChannel *ioc, Error **errp) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL(ioc); + + return qio_channel_close(sioc->master, errp); +} + +static GSource *qio_channel_stall_create_watch(QIOChannel *ioc, + GIOCondition condition) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL(ioc); + + return qio_channel_create_watch(sioc->master, condition); +} + +static void qio_channel_stall_finalize(Object *obj) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL(obj); + + object_unref(OBJECT(sioc->master)); +} + +static void qio_channel_stall_class_init(ObjectClass *klass, + const void *class_data G_GNUC_UNU= SED) +{ + QIOChannelClass *ioc_klass =3D QIO_CHANNEL_CLASS(klass); + + ioc_klass->io_writev =3D qio_channel_stall_writev; + ioc_klass->io_readv =3D qio_channel_stall_readv; + ioc_klass->io_set_blocking =3D qio_channel_stall_set_blocking; + ioc_klass->io_close =3D qio_channel_stall_close; + ioc_klass->io_create_watch =3D qio_channel_stall_create_watch; +} + +static const TypeInfo qio_channel_stall_info =3D { + .parent =3D TYPE_QIO_CHANNEL, + .name =3D TYPE_QIO_CHANNEL_STALL, + .instance_size =3D sizeof(QIOChannelStall), + .instance_finalize =3D qio_channel_stall_finalize, + .class_init =3D qio_channel_stall_class_init, +}; + +static QIOChannelStall *qio_channel_stall_new(QIOChannel *master, + unsigned rstalls, + unsigned wstalls) +{ + QIOChannelStall *sioc =3D QIO_CHANNEL_STALL( + object_new(TYPE_QIO_CHANNEL_STALL)); + + object_ref(OBJECT(master)); + sioc->master =3D master; + sioc->rstalls =3D rstalls; + sioc->wstalls =3D wstalls; + + return sioc; +} =20 typedef struct { bool finished; @@ -31,10 +148,12 @@ static void test_websock_handshake_done(QIOTask *task,= gpointer opaque) * the server wrote back, NUL terminated. The handshake is expected to * fail; the point of the test is the HTTP response that goes with it. */ -static char *test_websock_handshake_reply(const char *request) +static char *test_websock_handshake_reply(const char *request, + unsigned rstalls, unsigned wstal= ls) { QIOChannelWebsockHandshake res =3D { false, false }; QIOChannelSocket *cli, *srv; + QIOChannelStall *stall; QIOChannelWebsock *wioc; GMainContext *mainloop; int channel[2]; @@ -48,7 +167,8 @@ static char *test_websock_handshake_reply(const char *re= quest) qio_channel_set_blocking(QIO_CHANNEL(srv), false, &error_abort); qio_channel_set_blocking(QIO_CHANNEL(cli), false, &error_abort); =20 - wioc =3D qio_channel_websock_new_server(QIO_CHANNEL(srv)); + stall =3D qio_channel_stall_new(QIO_CHANNEL(srv), rstalls, wstalls); + wioc =3D qio_channel_websock_new_server(QIO_CHANNEL(stall)); qio_channel_websock_handshake(wioc, test_websock_handshake_done, &res, NULL); =20 @@ -68,6 +188,7 @@ static char *test_websock_handshake_reply(const char *re= quest) } =20 object_unref(OBJECT(wioc)); + object_unref(OBJECT(stall)); object_unref(OBJECT(srv)); object_unref(OBJECT(cli)); =20 @@ -77,7 +198,23 @@ static char *test_websock_handshake_reply(const char *r= equest) static void test_websock_bad_request(const void *opaque) { const char *request =3D opaque; - g_autofree char *reply =3D test_websock_handshake_reply(request); + g_autofree char *reply =3D test_websock_handshake_reply(request, 0, 0); + + g_assert_true(g_str_has_prefix(reply, "HTTP/1.1 400 Bad Request\r\n")); +} + +static void test_websock_stalled_read(const void *opaque) +{ + const char *request =3D opaque; + g_autofree char *reply =3D test_websock_handshake_reply(request, 1, 0); + + g_assert_true(g_str_has_prefix(reply, "HTTP/1.1 400 Bad Request\r\n")); +} + +static void test_websock_stalled_write(const void *opaque) +{ + const char *request =3D opaque; + g_autofree char *reply =3D test_websock_handshake_reply(request, 0, 1); =20 g_assert_true(g_str_has_prefix(reply, "HTTP/1.1 400 Bad Request\r\n")); } @@ -85,6 +222,7 @@ static void test_websock_bad_request(const void *opaque) int main(int argc, char **argv) { module_call_init(MODULE_INIT_QOM); + type_register_static(&qio_channel_stall_info); g_test_init(&argc, &argv, NULL); =20 #define TEST_BAD_REQUEST(name, request) \ @@ -101,5 +239,11 @@ int main(int argc, char **argv) TEST_BAD_REQUEST("bad-method", "POST / HTTP/1.1\r\nx: y\r\n\r\n"); TEST_BAD_REQUEST("bad-version", "GET / HTTP/1.0\r\nx: y\r\n\r\n"); =20 + /* A read which blocks before any header arrives is not a fatal error.= */ + g_test_add_data_func("/io/channel/websock/stalled-read", + "stats\r\nx\r\n\r\n", test_websock_stalled_read); + g_test_add_data_func("/io/channel/websock/stalled-write", + "stats\r\nx\r\n\r\n", test_websock_stalled_write); + return g_test_run(); } --=20 2.53.0