From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 09C6A42ECF for ; Thu, 20 Jul 2023 17:27:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05AEB40685; Thu, 20 Jul 2023 17:27:34 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6CB20400D6 for ; Thu, 20 Jul 2023 17:27:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSR1J2H1053R4D5/jRYbMbVXgAtByVVmK/VI3vwfRD4=; b=GVpDHQnq1Ffw3JkRyWLYlOiJqgJTOoXbyh4RLhH5mtvhKiLwe4n9kby3hf85TxdQIghyJ8 rbuifwzo/p6hVMlRpXtOsSAx8xB71L7XQUyT8WDsCVaTFWW7Nfc7pB6PKDCKj15BxjIKtn uZ/cix3+YXolvtkqy+JOqtUly0KSPWM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-93-zS_8N32SOnKniAD8TfJ8HA-1; Thu, 20 Jul 2023 11:24:08 -0400 X-MC-Unique: zS_8N32SOnKniAD8TfJ8HA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A925289225E; Thu, 20 Jul 2023 15:22:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FB6F492C13; Thu, 20 Jul 2023 15:22:52 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Long Li , dpdk stable Subject: patch 'net/netvsc: fix sizeof calculation' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:06 +0100 Message-ID: <20230720151942.262154-115-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/0df6ac4f09d49a54d9782d846245b0cb886933db Thanks. Kevin --- >From 0df6ac4f09d49a54d9782d846245b0cb886933db Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 28 Jun 2023 17:29:57 -0700 Subject: [PATCH] net/netvsc: fix sizeof calculation [ upstream commit 86fb73f5bf401afc9d52144f27e6d1cf4f64348b ] Found by cppcheck. drivers/net/netvsc/hn_rndis.c:332:21: warning: Found calculation inside sizeof(). [sizeofCalculation] if (len < sizeof(3 * sizeof(uint32_t))) { Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Stephen Hemminger Signed-off-by: Long Li --- drivers/net/netvsc/hn_rndis.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c index 1b63b27e0c..8c205233a2 100644 --- a/drivers/net/netvsc/hn_rndis.c +++ b/drivers/net/netvsc/hn_rndis.c @@ -330,5 +330,6 @@ void hn_rndis_receive_response(struct hn_data *hv, hn_rndis_dump(data); - if (len < sizeof(3 * sizeof(uint32_t))) { + /* Check we can read first three data fields from RNDIS header */ + if (len < 3 * sizeof(uint32_t)) { PMD_DRV_LOG(ERR, "missing RNDIS header %u", len); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:08.934727408 +0100 +++ 0115-net-netvsc-fix-sizeof-calculation.patch 2023-07-20 16:17:55.110752342 +0100 @@ -1 +1 @@ -From 86fb73f5bf401afc9d52144f27e6d1cf4f64348b Mon Sep 17 00:00:00 2001 +From 0df6ac4f09d49a54d9782d846245b0cb886933db Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 86fb73f5bf401afc9d52144f27e6d1cf4f64348b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index e6f1f28768..29c6009b2c 100644 +index 1b63b27e0c..8c205233a2 100644