From patchwork Tue Mar 28 11:32:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 76015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2152535vqo; Tue, 28 Mar 2023 04:51:32 -0700 (PDT) X-Google-Smtp-Source: AKy350acRpDkM7j0zCm3kIMQPyBD9mW8eH6AAT+2SHijqNWCYH/5fuGfdV9j438mRpgU4rz/TXAy X-Received: by 2002:a17:906:6897:b0:931:75f5:36db with SMTP id n23-20020a170906689700b0093175f536dbmr15428390ejr.11.1680004292210; Tue, 28 Mar 2023 04:51:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680004292; cv=none; d=google.com; s=arc-20160816; b=VyMPa/czP9f6Uxl80eqt0wjr73elQK+EEoK2qPwp/c76+BwU098dY99pDngdKkasDo 8+lUO+KSZLGcNYYnSJDDk9krqXAiKICwgRiFy4JWPvanXlPyECrT4Mt/ZAN09uu5/PtT lVNSRxthIJNO2m54Zeai3mP5JaFq/ZFxXs0hiT5zcY6QfIN06BaIX4t96ihv6xfby/MH RJbcaSsfZQQgdhxPSgt64nn8Tumtvz+5RU/T+IY7Dc+eLMfKzS8dK5mfil6aTf9nFy3u rvVePDlUmmBay+6Gq9ygt9z0mM26YsH4Ae+6yDOrZZi8XWVSXmmGj9YyUzVrKBFt7Mci kNKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:subject:from:cc:to :in-reply-to:content-language:user-agent:mime-version:date :message-id:dkim-signature; bh=HBjatGeLTuJZ9m4w/f+ZHR2uNtEPcvhrqsXeGQRsL30=; b=SmZBAeGYT09mRdwCUK5nABssUF+woKLMmOGoggpvMEbjF14s/PzXKnUxZIJ0EQfIw3 bDYRSsGmw7spWvbbl0QuU36s4QjqjLRZ3czodELS4tT9yX4BlJtwmOZCCHcE8jN5qElX 2zDDAfOoPB6yk/+EPl2OHOUYK/s+MxxWYQulRXwuJxa9i/sV443wRd4PjGrLoCk4CU4w y7tCa0FarphuaOlLmrpnANVkVIOCayUuG0Zqpi992yU8oC6czuytb/L8urJtbaT6soyV DLzKX/p9D080dAe3R/y6csboBn6ikSEOUZx0IyaqsPWpHx6KS7cCzzyw8uuYvrdKeOJP 1/ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=gtIBtkfk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n16-20020a170906b31000b009267d6857ebsi29206677ejz.952.2023.03.28.04.51.08; Tue, 28 Mar 2023 04:51:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=gtIBtkfk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232616AbjC1Lfl (ORCPT + 99 others); Tue, 28 Mar 2023 07:35:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232440AbjC1Lfg (ORCPT ); Tue, 28 Mar 2023 07:35:36 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A0C5BA1; Tue, 28 Mar 2023 04:35:35 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 4FE0E5FD14; Tue, 28 Mar 2023 14:35:33 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680003333; bh=HBjatGeLTuJZ9m4w/f+ZHR2uNtEPcvhrqsXeGQRsL30=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=gtIBtkfkERNGerXXRbbTAqZ07ObmuEwH4pkfmkRmcQUe9r7bymmH8i290LvCQfC3E WDgAOj40A/aYAm1m9f09++6resANwCjFfx8E5P0mAZJ7JMEsIxC8YKqUqVLSTYKi11 YJYajCRtLcs9AxAeofwcOdykooFD1dohASpSsj34EJlaJ9SeXD9C31BbLH/j1hDwRw kd77rWzl0oBLC0zP2nSYeDt1zJgqft23Bt1zLcUPHONqBFutJ2uvIWYEJcJU0QLxp7 muc2B69lkS/tEPL7Msi66cEhL0NFrThYDnE4Tc+QlhpSWtdsbsSiB4UobN1ixpZOTr XnKtA7OpN7C2Q== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Tue, 28 Mar 2023 14:35:33 +0300 (MSK) Message-ID: <40393903-1414-5188-4fae-ccaad0f2fe72@sberdevices.ru> Date: Tue, 28 Mar 2023 14:32:12 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Content-Language: en-US In-Reply-To: <0683cc6e-5130-484c-1105-ef2eb792d355@sberdevices.ru> To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [PATCH net v2 2/3] virtio/vsock: WARN_ONCE() for invalid state of socket X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/03/28 06:38:00 #21021220 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761612181002625875?= X-GMAIL-MSGID: =?utf-8?q?1761612181002625875?= This adds WARN_ONCE() and return from stream dequeue callback when socket's queue is empty, but 'rx_bytes' still non-zero. This allows the detection of potential bugs due to packet merging (see previous patch). Signed-off-by: Arseniy Krasnov Reviewed-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index b9144af71553..f0187659289f 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -398,6 +398,13 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, u32 free_space; spin_lock_bh(&vvs->rx_lock); + + if (WARN_ONCE(skb_queue_empty(&vvs->rx_queue) && vvs->rx_bytes, + "rx_queue is empty, but rx_bytes is non-zero\n")) { + spin_unlock_bh(&vvs->rx_lock); + return err; + } + while (total < len && !skb_queue_empty(&vvs->rx_queue)) { skb = skb_peek(&vvs->rx_queue);