From nobody Sun Feb 8 20:12:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150522987829520.059107399912364; Tue, 12 Sep 2017 08:24:38 -0700 (PDT) Received: from localhost ([::1]:36502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drn3F-0006HN-Ev for importer@patchew.org; Tue, 12 Sep 2017 11:24:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drn16-0004ky-7c for qemu-devel@nongnu.org; Tue, 12 Sep 2017 11:22:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drn15-000731-27 for qemu-devel@nongnu.org; Tue, 12 Sep 2017 11:22:24 -0400 Received: from mail-pg0-x22a.google.com ([2607:f8b0:400e:c05::22a]:37855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1drn14-00072e-Rd for qemu-devel@nongnu.org; Tue, 12 Sep 2017 11:22:22 -0400 Received: by mail-pg0-x22a.google.com with SMTP id d8so21859357pgt.4 for ; Tue, 12 Sep 2017 08:22:22 -0700 (PDT) Received: from servo.cypherpath.com (68-113-0-218.static.knwc.wa.charter.com. [68.113.0.218]) by smtp.gmail.com with ESMTPSA id d18sm12753054pfk.11.2017.09.12.08.22.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 08:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cypherpath.com; s=google; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0VmBw3vqQ+DycFtgUChZiVJJOdmH1XwXIJ2fJl1tV2Y=; b=k18e2+CUcRcZZn7aFFp+a2JqaVn62GTGMP2YX1cXRHBiX2IkmRtGi7MxOkTQUnu0zY GXksDfkY/3V1VIScv5WDbPvoBYgwuQpwIVHrXovPvLj+ZYKfY7TZs7sxoGgnJSqNBlRv q9qSaxqlL8T9TutKHEUb31G8XQ2kNz8g3619g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references; bh=0VmBw3vqQ+DycFtgUChZiVJJOdmH1XwXIJ2fJl1tV2Y=; b=JfLtp3pUB6fMJ9yMltMGAiMLbM3+yvrwnKdXMyFsrPlYtSUhoBxDfqIA3jh/TXqTzp uySCu3lkdaLhxVAgtxBE9TObkaQRz2XQAaUrDZtNP5BDUoqQBJCc79sNnUKT7eNYc/HY GTWIbfx90JhhuJ1wVtEi9HkxdTwpPkgiiKPXXsbQC6bHV6cvJbcKhLNPeWwD9pT5+lBl n6UEUFp7ktJltbwxaWtyqje63867dFKCSo5M0FYpmCTfyHUvEPD48JiLqk37pUjcPvke TVkCkl/BH6wHCSCqD+wd4/21aXp+7z1yfMeyPPc3gSrGTOKvOT3CzDksWkcuHAhm5q5M 8Z3w== X-Gm-Message-State: AHPjjUg89wPSCkcna8e7pcsYioaKvouXurdEqn+1OR1+maY+fCIsjP8O 0WKmqUio1tcuAne4P6XvhvAtLUITkcaA76OizHruZCwe4ww7IC5ojZ36vJgG++o56uzTvQlI8wu j8Bss MIME-Version: 1.0 X-Google-Smtp-Source: AOwi7QCba1RkEpsOHy9dcUF6BoyRF+8i2OmlFU7U8uTzekyyxW1/H6759Tw+D/3sCIefWFO1k/qT+A== X-Received: by 10.84.235.65 with SMTP id g1mr1419404plt.353.1505229741742; Tue, 12 Sep 2017 08:22:21 -0700 (PDT) From: Brandon Carpenter To: qemu-devel@nongnu.org Date: Tue, 12 Sep 2017 08:21:51 -0700 Message-Id: <20170912152153.7729-6-brandon.carpenter@cypherpath.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912152153.7729-1-brandon.carpenter@cypherpath.com> References: <20170912152153.7729-1-brandon.carpenter@cypherpath.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::22a Subject: [Qemu-devel] [PATCH v3 5/7] io: Ignore websocket PING and PONG frames X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: brandon.carpenter@cypherpath.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Keep pings and gratuitous pongs generated by web browsers from killing websocket connections. Signed-off-by: Brandon Carpenter --- io/channel-websock.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index 3183aeff77..50387050d5 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -86,6 +86,7 @@ #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_OPCODE 0x0f #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_HAS_MASK 0x80 #define QIO_CHANNEL_WEBSOCK_HEADER_FIELD_PAYLOAD_LEN 0x7f +#define QIO_CHANNEL_WEBSOCK_CONTROL_OPCODE_MASK 0x8 =20 typedef struct QIOChannelWebsockHeader QIOChannelWebsockHeader; =20 @@ -565,8 +566,11 @@ static int qio_channel_websock_decode_header(QIOChanne= lWebsock *ioc, return -1; } } else { - if (opcode !=3D QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME) { - error_setg(errp, "only binary websocket frames are supported"); + if (opcode !=3D QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME && + opcode !=3D QIO_CHANNEL_WEBSOCK_OPCODE_PING && + opcode !=3D QIO_CHANNEL_WEBSOCK_OPCODE_PONG) { + error_setg(errp, "unsupported opcode: %#04x; only binary, ping= , " + "and pong websocket frames are supported", op= code); return -1; } } @@ -579,6 +583,9 @@ static int qio_channel_websock_decode_header(QIOChannel= Websock *ioc, ioc->payload_remain =3D payload_len; header_size =3D QIO_CHANNEL_WEBSOCK_HEADER_LEN_7_BIT; ioc->mask =3D header->u.m; + } else if (opcode & QIO_CHANNEL_WEBSOCK_CONTROL_OPCODE_MASK) { + error_setg(errp, "websocket control frame is too large"); + return -1; } else if (payload_len =3D=3D QIO_CHANNEL_WEBSOCK_PAYLOAD_LEN_MAGIC_16= _BIT && ioc->encinput.offset >=3D QIO_CHANNEL_WEBSOCK_HEADER_LEN_16= _BIT) { ioc->payload_remain =3D be16_to_cpu(header->u.s16.l16); @@ -634,9 +641,15 @@ static int qio_channel_websock_decode_payload(QIOChann= elWebsock *ioc, } } =20 + /* Drop the payload of ping/pong packets */ + if (ioc->opcode =3D=3D QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME) { + if (payload_len) { + buffer_reserve(&ioc->rawinput, payload_len); + buffer_append(&ioc->rawinput, ioc->encinput.buffer, payload_le= n); + } + } + if (payload_len) { - buffer_reserve(&ioc->rawinput, payload_len); - buffer_append(&ioc->rawinput, ioc->encinput.buffer, payload_len); buffer_advance(&ioc->encinput, payload_len); } return 0; --=20 2.14.1 --=20 CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, is=20 for the sole use of the intended recipient(s) and may contain proprietary,=20 confidential or privileged information or otherwise be protected by law.=20 Any unauthorized review, use, disclosure or distribution is prohibited. If=20 you are not the intended recipient, please notify the sender and destroy=20 all copies and the original message.