From patchwork Fri Mar 3 22:01:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 64113 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp698834wrd; Fri, 3 Mar 2023 16:30:44 -0800 (PST) X-Google-Smtp-Source: AK7set90cxaAciDwWOK+7qlIwrKTZPdlOV/p2Qp6hWH5Ku/ABGJi1CIEH+Fc4LjZ99rKp8dwfG/Z X-Received: by 2002:a17:906:1481:b0:8b1:7ae8:ba6f with SMTP id x1-20020a170906148100b008b17ae8ba6fmr3575752ejc.16.1677889843939; Fri, 03 Mar 2023 16:30:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677889843; cv=none; d=google.com; s=arc-20160816; b=tq9V6+Tto8+bCgkYRMUSVOFnHbQL6CV6I1uWJx7lrJctQCrpj9ifLUp2z5HbaFwqxi i+F4RhMRYmz4j5yfAkBXnlX7w6o5qzwUmRnXWI05uJXchdhRap4eOGu4WiyP7L+IISaW 1j0HtcXYyN4EMQVBCDdPElRsmA9BbfrHj7PKY52mlIzCZfo8eFwUSPT/fQlgWiorVgx7 XcAW1+xCNPRZeyVbLVt+Z/e75mwTqhg3JkhL5fhvX0AE0x7srDG6khUH8DBcbQwhOQAq KQD3gmzO6wjLF4eQHmfdGsY4mBY6+BjMHgMDSIsZzlWLNRXaWqLDbLNykuOGVgOf5CNd NNBw== 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=Icgy8iDTd8OsLA0qcC7gyzpquMde/dsgpaxAtiinzyo=; b=zcGJSpbNDWpeKz4tOGSHHQU+u+oj2YtYg2p0PW4GJghRDJZ8eEwxL6l0m9dzG6hX4b OjGq13IPhoC4uJAYN2UEzOcKAkRwnA0VcXKzElNb7rU4GCt9e9XMd54X3ZVfqA3L41nB LRgc7efpllfaTShmsP0ntbgooipRNlg0fDJ31/nsqu91i8tjPo2iCgDuq+BrGstTXq9N W2y1Gcg3ePLtpSSOW9LXtAYp9CdYr4+iOrhs3HYGOck815apl2105q3JtJZcdf2d3gmf SV82eKHdG6s9kSLeTS7h7cgZ5vOiJxwY+zgMxoLrPPaCZqT4doqzpjf48VpkXXsvQ9rZ w02A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=bBOOyNLj; 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 wu5-20020a170906eec500b008bedf75469bsi4773182ejb.736.2023.03.03.16.30.20; Fri, 03 Mar 2023 16:30:43 -0800 (PST) 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=bBOOyNLj; 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 S229880AbjCDADd (ORCPT + 99 others); Fri, 3 Mar 2023 19:03:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbjCDAD1 (ORCPT ); Fri, 3 Mar 2023 19:03:27 -0500 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6B95EC71; Fri, 3 Mar 2023 16:03:24 -0800 (PST) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id C4DB85FD19; Sat, 4 Mar 2023 01:04:24 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1677881064; bh=Icgy8iDTd8OsLA0qcC7gyzpquMde/dsgpaxAtiinzyo=; h=Message-ID:Date:MIME-Version:To:From:Subject:Content-Type; b=bBOOyNLjfdEd0XdCMzLE+adQMP36CslJqEklfr63E9CrBCwE6EPFLDpSGUbxhL+uE 9+PiLk1FV2GDtqjPqDFZhIg9QtlwRlt5ffO5bDFsFU4HM8OlZNEtc/J84NUP7l+Pc4 SpnxpNF9BMGvHtU0nMzUNVS7IhmokX9C192mwi5QnMRRtVn9V28NNMDo/WntG8EZSn 5vFsK6X30TEm+YiDW1Glcdu5N2Rmxg4eKiaiFr0At5F0G1M+khWOoKcVGq6uAJTq40 9UPgdHM50t3WUIWQhZpBxdypTIfTymbanNevw8AHi1nlqx5eFE8f+VEBuIicdNQYyr diI7J7Ow17ieA== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Sat, 4 Mar 2023 01:04:24 +0300 (MSK) Message-ID: <0ec95196-7445-b183-022d-fd3e1e1a7529@sberdevices.ru> Date: Sat, 4 Mar 2023 01:01:34 +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: To: Stefan Hajnoczi , Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bobby Eshleman CC: , , , , , , From: Arseniy Krasnov Subject: [RFC PATCH v1 2/3] virtio/vsock: fix 'rx_bytes'/'fwd_cnt' calculation 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/03 17:09:00 #20912733 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1759395021082843061?= X-GMAIL-MSGID: =?utf-8?q?1759395021082843061?= Substraction of 'skb->len' is redundant here: 'skb_headroom()' is delta between 'data' and 'head' pointers, e.g. it is number of bytes returned to user (of course accounting size of header). 'skb->len' is number of bytes rest in buffer. Fixes: 71dc9ec9ac7d ("virtio/vsock: replace virtio_vsock_pkt with sk_buff") Signed-off-by: Arseniy Krasnov --- net/vmw_vsock/virtio_transport_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 77bb1cad8471..d80075e1db42 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -255,7 +255,7 @@ static void virtio_transport_dec_rx_pkt(struct virtio_vsock_sock *vvs, { int len; - len = skb_headroom(skb) - sizeof(struct virtio_vsock_hdr) - skb->len; + len = skb_headroom(skb) - sizeof(struct virtio_vsock_hdr); if (len < 0) pr_emerg("Negative len %i\n", len);