From patchwork Wed Jan 10 15:13:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edgar Kaziakhmedov X-Patchwork-Id: 858338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="KJLzqOVR"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zGswt0w39z9s7M for ; Thu, 11 Jan 2018 02:14:04 +1100 (AEDT) Received: from localhost ([::1]:47715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZI4o-0004Bm-BX for incoming@patchwork.ozlabs.org; Wed, 10 Jan 2018 10:14:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZI4S-0004BA-Pi for qemu-devel@nongnu.org; Wed, 10 Jan 2018 10:13:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZI4M-0000XD-F5 for qemu-devel@nongnu.org; Wed, 10 Jan 2018 10:13:40 -0500 Received: from mail-eopbgr30124.outbound.protection.outlook.com ([40.107.3.124]:6055 helo=EUR03-AM5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZI4L-0000W0-PA for qemu-devel@nongnu.org; Wed, 10 Jan 2018 10:13:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Hdlga0/02Zsm0mpc370D5LPLE47mEg+dh+pOcOjBGxc=; b=KJLzqOVR2H0T0B0P5VvjwfK9jjmI/8kGGrOVDSRC7budCRBnnw/kRV5OuD0f4g7JTwngDidb7ce8G9BjMTlx/59o80/LGdyPWVhQW9dfqmw3LAbpbUYM/C+BH3c9bfv/OyFxZim5tTburt4OeDAwycAX2OCUAAJ9Y7Bstm/yDG4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=edgard.kaziakhmedov@virtuozzo.com; Received: from virtstar.sw.ru (195.214.232.6) by DB6PR0801MB1942.eurprd08.prod.outlook.com (2603:10a6:4:75::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 15:13:30 +0000 From: Edgar Kaziakhmedov To: qemu-devel@nongnu.org Date: Wed, 10 Jan 2018 18:13:22 +0300 Message-Id: <20180110151322.16119-1-edgar.kaziakhmedov@virtuozzo.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR07CA0009.eurprd07.prod.outlook.com (2603:10a6:7:67::19) To DB6PR0801MB1942.eurprd08.prod.outlook.com (2603:10a6:4:75::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e032ec95-3c85-46f1-2eca-08d5583cb58c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR0801MB1942; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1942; 3:T5Jms06JeOiUEaapySLwnhXVf7ljdEBJk/5K+tt7oVT8ZZoJbtQ8XN5O06ueoJIJeYQm+hw2HsAlxe4pC6OSxGF9DJiZooe3AeLH7Nq8STvHRRDYJJjJwmmGARRLr6Xxi+3rwOZHVaUvzomMsiBkzwyycbvDUS9cxTiG5Xoki0fzqxSkz1E66yhSdGFBRT/C+yEy4XL54bqQjFxRRFtF2zLhgbT/OSKFLnXL2xOPTdwbaLN1/4aSEnpMC0uwXuPP; 25:sHOSjWnjyzQrtvW5lnLhaRNYsCgDX5kIe9RTZ8VIzyK64bBXX1hGV1mhqgEQDlWj3qluZWjRuZLeXBTlCOj5DFBxGBKP/vwYC6LvH/FPH1mnlcb+qJ8rC3YguHcwGQL4UyYdoStsLZ6HNuBQtrAxjbI6bMssOcdR0i8Weqm2f6VvPoXyb2ifgaFemHe9qiptQ3UiI5CzIgv1LoyGJMgaENCa/pKNLjdq3W4mxZMhSmNvxH4yZvuoOkxaSZ9UeOzGKo/c2dxxk4x1fIQhv3FwiZRIr1wkPX/efnaBe1pSsguj6IE5kl/kFu+zMIeukPpFUBh5jqGPZECKOi7Q2hStng==; 31:BWf4U4oK4+EduD4lfYIKb24wSPB4ySUMSaqeNvPW+I0a3XixM4xC37uzEtqmo3DrRw/y8sMnYsNnG8EoBaqoWAo4DjyPO65bpYAA1VHBIlpiv4IWPDvJUWsGiL5NlkDvddRDyKLt/YeVUDOyuVt6gpIBSXHp8Vb511wovc7/ZIbDWIRA85cvZkT/tKKz89oQT4ayQVvALVcrUstAtgcwdfi3TGHR6jVIDNeaOubjsQc= X-MS-TrafficTypeDiagnostic: DB6PR0801MB1942: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1942; 20:1aL5sXQokgvgylanflC7X/X1yPQvdMAsTEfdZKviSXO2qqhxCwjv6Vbc3SlZF6Tj8sEKBOpgqRocUnkyhf8e/cDKxNsbktDfztjb2wwSN8BbuNBeZVMJRBNRkl+XKIk3qQ2edV8Fmgnd0juiZ/67sr2LyZ3dXFz1+sLpfMMCbxLlNxSYS4Qom1D4qXUV/XOSzcgcs0OBoNNEwRj3B2wjZCMFAwawawmsywD2gRiJSWom6CN/wQTkSdaiYI6XfNzRAXJjkJ7EbjMafnZsuVXga5ZHz4hOuQBtCS5VvbquIfsQn7yxY43CmtZx07/jaTm0e6KmxDa76MAJnJ5hDY/0xzUkeOH3kn7qhQsgWgbMOn8B22oHuOCXNuI5zTEOjf8Puj6WoTBlcqwgfSaEpDgblyxAlN13eFrE5ivaOkkikAY=; 4:TyDjEebCEpA+7R6Ak7T2jMzPMqxyyR78CIKtqUQL2oPmTAgIFv19yu7X3M6kAv9NPnc0kvK2d71N9LM3SoT0vzTTCYia0nxHs54/POtJeqP+t2DEuaDp7jMf1GFFEcgVoKWqGtJzPx6+1n7Ayp0lE1xwyD7g2u4aP08Y9tRVhdZXfNQGDN1X/c2PYOcOtvvOUepd1HTSyeTfqliNM7l8QQr9mmj+z4WIrzynW1c4h/f/Q7HzRV/SqCSjVTg+q1jdOrqwKFzprfsFqsyJha2TLw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231023)(944501075)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DB6PR0801MB1942; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR0801MB1942; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(346002)(366004)(376002)(39380400002)(39850400004)(199004)(189003)(105586002)(36756003)(1076002)(8676002)(305945005)(6666003)(69596002)(6916009)(50226002)(55236004)(2361001)(2351001)(6506007)(386003)(47776003)(106356001)(5660300001)(7736002)(16526018)(107886003)(97736004)(53416004)(68736007)(52116002)(51416003)(6512007)(50466002)(316002)(6486002)(478600001)(59450400001)(4326008)(66066001)(2906002)(6116002)(8936002)(81166006)(81156014)(25786009)(16586007)(3846002)(53936002)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB1942; H:virtstar.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0801MB1942; 23:ju8kM/PEFUaK6ibgmLBE8X7gcytRwJNET3KPsIQ?= c8dceqep4/aW0M9qLAEkf2sitlnDtGut8oszdWPpbxORvdrg6IJBXbwHqF+3J96/sj3FunvMP6aRnq6y+uKxS7TDTWBcrh3DZXhfr3WZ5DFvHquI28T+LwikzTtRNnwqNxLQWAqu0V7mFPooJdyRhojGP+Ndf9TwIWu2tOmWP+ptkiDg1D3P/LVgYLn0bdGio5tdcMWuYwptMUKv+2UUqcg9Kae9TgKZpCY///2ZK/gzpmFThNxmkpaG12ml3Ta698jnBh4Z0ddD0I8zyOgPdKfIhIAy5j7WN7M3IBm84s/w26OApp+WiY0hSfYVRxj29HfReGoOKdhM+qfccV+OkuEbdAKOJEAipRc5cOLUma+BYmRJNWLVveyDHBiVfFtbaUXN2zwIH2RKe82OelD3/23IsSTkbEBfsLRfW3AIW6ViUKVzRqxxluciAmsZaYn+eRG2VvgwzTwaUdE8StFVMecEW4hKBo6mp+ijkk83uqn/8XvydJn4i/zwt+29lxMO2EWFDlzsfhGjtPNFdTfJokGvkVQ+Yt0Ei3KdQ6vVazqu1QHqzYGpazASyshuB3GNY5ku0zs5kdsUetGRFD448rUepCqwrqszN+e0ZPF+DWy76O/taw/jmYvx0wcbN2EK4/BXAzKBf6d7b7nmoLZS+SFeHh5Ozdt2KU2qyjOMlldASrVqz9q21TBKcEceIxM1/9PjpGgfSRYiF5EAYOFd6qkOSMwnQ56JpMw5Ww7ZC2/YZZMNGD1D1Wo8w0Mw5GGErinzz4iCdTxrsGY0SS3S1XbYK4Mcc2t6KVAkgprd5zn9R3e8/QcnBjB4Gjjro1Jz+TyTIsQaEIMDoqPOEMYZ7iMCYnCGMCuLi1z6Lu8Uto+ZMoSCru30rIUKR36WleElnotRx0XEU6q7yuZB9Kyia/QilhpO/NCq0jkDnIfDq9/E7Xwx7DQW6Dsey8IBSDZRbL835CZq90wOgl/hmmMfXaEtRQk0uKPKAFJtwYETW3i6N8/+T/IfRmbkm2bwTM5HqufdhgBLWoyuw9sFx11vmMEonXSd/Mwph/H+m2usoJi2++S9HE+jMUcBWiP9T9x5wzRNIeSGsX5RMRPVqtFaVAY5zwGrn0Z4qxMbselwvCK8NTA== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1942; 6:4105AA9m/PG7SCFd7j0jEZxq4lKJm7jAj/TiSnZEhFj9LUYljq8yY5Yb+rxao8/+Bx5WdAms1RgYFhPzJe0dAbQKBo31AL1z4DUxq+6Vg9o+HqwzsaGI9sO1jf32NrDjLox/KvnRtwoJhpMa+0es8THcgtmYnoT08rbE4ZvCGnzxqkCD/n3te2MzRrNKU95S3s5mSh5G4rugUEGyyv5rjChBpk7jUGf9WLx+pY4XpoV+NFaMJX/WLavqwd155OVHGfGAe/UBiLlPs2YMncM5DbJk7F2QV0KIEpRtZPkE1M7yX/5cXfkoMyJS3Qtf8PTxfqMz+b7x/VWH2u6mpOH9lOY6J4OrD2wffuRIExykmWk=; 5:LP6YzWMxeq9vDi76wWnEufC1NTQ7x0SAZ7gIeCCxd5GKP6bRyVsa39nu3H46l/GbOCwwRxpOWfqwb/O5TUJwPtqKQUsyV0ZvA1wP+jkWHEbzprLhD7j7YMVqxr3gxD5ep65/Aj+2r0JIWsmWRTTw8Mrj5+llApYg9Nt2eAd0sCc=; 24:YAJxzoIpmkiT/qcTkExQjQmsudJpf5XbefkeYQFkIllOymZNPqr1OvmEuwBIEZKEMp5Yc1yWlBXRwmdxK6lOh3Yh+4YUz2aOrWfu7bwJByM=; 7:TKT5x9HVAfFsTWL9gCW8D0daBzrUY7xVZsfpaebcGUbAhrcCX5RZfmNk1dx4wO94gYTOoXOgzw2h3qV29RTXw99aGzuDcV0cBZPQpNk5PD/yw3+SdmygjPQ4xr5BlhRiyY3nEc9MjWGF2bc1OANjAi0hV+AQ0w6n//2I1/mNFQWEWnBw3Ek0YG0hprxGwz5rYXAPeQAkS7FaCPqM0veMjusqDj+9397fj6x056w3m2xCA3ta0O2Njn8E7alsBsPT SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1942; 20:4piH7w65ZM7Aym1yngvvBUboBkwupY0dKBtlYfiiTvw8gtzhad1OWWdZsWYnndwV3r75co9B4KQVMupcKF8J7I5O4Hoxnh4kd65dAIu9WQ6LgUGLPwEMJeoxwvxZcISJePWlXuPPDqsTaFvtzCFcJ94RsAKXBUwuwbCHC6V30mg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 15:13:30.6188 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e032ec95-3c85-46f1-2eca-08d5583cb58c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1942 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.3.124 Subject: [Qemu-devel] [PATCH v2 1/1] io/channel-websock: handle continuous reads without any data 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: den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" According to the current implementation of websocket protocol in QEMU, qio_channel_websock_handshake_io tries to read handshake from the channel to start communication over socket. But this approach doesn't cover scenario when socket was closed while handshaking. Therefore, if G_IO_IN is caught and qio_channel_read returns zero, error has to be set and connection has to be done. Such behaviour causes 100% CPU load in main QEMU loop, because main loop poll continues to receive and handle G_IO_IN events from websocket. Step to reproduce 100% CPU load: 1) start qemu with the simplest configuration $ qemu -vnc [::1]:1,websocket=7500 2) open any vnc listener (which doesn't follow websocket protocol) $ vncviewer :7500 3) kill listener 4) qemu main thread eats 100% CPU Signed-off-by: Edgar Kaziakhmedov --- io/channel-websock.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/io/channel-websock.c b/io/channel-websock.c index 87ebdebfc0..384c34b390 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -81,6 +81,11 @@ QIO_CHANNEL_WEBSOCK_HANDSHAKE_RES_COMMON \ "Connection: close\r\n" \ "\r\n" +#define QIO_CHANNEL_WEBSOCK_HANDSHAKE_RES_EOF \ + "HTTP/1.1 403 Request Entity End Of File\r\n" \ + QIO_CHANNEL_WEBSOCK_HANDSHAKE_RES_COMMON \ + "Connection: close\r\n" \ + "\r\n" #define QIO_CHANNEL_WEBSOCK_HANDSHAKE_DELIM "\r\n" #define QIO_CHANNEL_WEBSOCK_HANDSHAKE_END "\r\n\r\n" #define QIO_CHANNEL_WEBSOCK_SUPPORTED_VERSION "13" @@ -502,9 +507,14 @@ static int qio_channel_websock_handshake_read(QIOChannelWebsock *ioc, error_setg(errp, "End of headers not found in first 4096 bytes"); return 1; - } else { - return 0; + } else if (ret == 0) { + qio_channel_websock_handshake_send_res_err( + ioc, QIO_CHANNEL_WEBSOCK_HANDSHAKE_RES_EOF); + error_setg(errp, + "End of headers not found before connection closed"); + return -1; } + return 0; } *handshake_end = '\0';