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 2A28D42ECF for ; Thu, 20 Jul 2023 17:22:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 267E642D41; Thu, 20 Jul 2023 17:22:37 +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 1865F42D37 for ; Thu, 20 Jul 2023 17:22:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866554; 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=98cP9RFFsntlJnwn40+RY5mrS+rCM/jztjEc0bSVW/Y=; b=EbxVUuQlGEk5XwLoDstXyyUyj/YOiSB0QotMGjLojGhdOrgEeqYzO0sYfP8yFL1cDB+EMM 94VyGCFnX300PAbRVhQ4EgVs1cGolWNm56lfUhH6F3/ecFWf+6d/DKxjJa+7b0VvL1SgOI YMwit2K3dD70RCsDE8iBIFkL7LLinn4= 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-417-FseMBLMzPSWFzXeyV9sQ5g-1; Thu, 20 Jul 2023 11:21:34 -0400 X-MC-Unique: FseMBLMzPSWFzXeyV9sQ5g-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 13EBD88D7FC; Thu, 20 Jul 2023 15:20:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA6D64A9004; Thu, 20 Jul 2023 15:20:43 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix variable type mismatch' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:43 +0100 Message-ID: <20230720151942.262154-32-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/5c105051b9af46113f5798fcc5f8881b0c28554d Thanks. Kevin --- >From 5c105051b9af46113f5798fcc5f8881b0c28554d Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 22 May 2023 21:17:38 +0800 Subject: [PATCH] net/hns3: fix variable type mismatch [ upstream commit 1bbac8785cdf51bc6c5005c6754eab4d517cc4b0 ] Loop conditions are compared with different variable types, which may cause overflow risks. Fixes: 67d010346933 ("net/hns3: adjust data type of some variables") Fixes: 6ee07e3cb589 ("net/hns3: fix insecure way to query MAC statistics") Signed-off-by: Dengdui Huang Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_regs.c | 5 +++-- drivers/net/hns3/hns3_stats.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c index 86a4cf74d5..95b93af733 100644 --- a/drivers/net/hns3/hns3_regs.c +++ b/drivers/net/hns3/hns3_regs.c @@ -295,6 +295,7 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data) uint32_t *origin_data_ptr = data; uint32_t reg_offset; - int reg_num; - int i, j; + size_t reg_num; + uint16_t j; + size_t i; /* fetching per-PF registers values from PF PCIe register space */ diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index 767e3728f1..169bad1412 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -318,5 +318,5 @@ hns3_update_mac_stats(struct hns3_hw *hw) uint64_t *desc_data; uint32_t desc_num; - uint16_t i; + uint32_t i; int ret; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:58.921077190 +0100 +++ 0032-net-hns3-fix-variable-type-mismatch.patch 2023-07-20 16:17:54.570750136 +0100 @@ -1 +1 @@ -From 1bbac8785cdf51bc6c5005c6754eab4d517cc4b0 Mon Sep 17 00:00:00 2001 +From 5c105051b9af46113f5798fcc5f8881b0c28554d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1bbac8785cdf51bc6c5005c6754eab4d517cc4b0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17 @@ - .mailmap | 1 + - drivers/net/hns3/hns3_regs.c | 3 ++- + drivers/net/hns3/hns3_regs.c | 5 +++-- @@ -19 +19 @@ - 3 files changed, 4 insertions(+), 2 deletions(-) + 2 files changed, 4 insertions(+), 3 deletions(-) @@ -21,10 +20,0 @@ -diff --git a/.mailmap b/.mailmap -index 863dbecdb0..f00c1e5457 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -302,4 +302,5 @@ Deepak Kumar Jain - Deirdre O'Connor - Dekel Peled -+Dengdui Huang - Denis Pryazhennikov - Dennis Marinus @@ -32 +22 @@ -index 33392fd1f0..5d6f92e4bb 100644 +index 86a4cf74d5..95b93af733 100644 @@ -38,2 +28,3 @@ -- uint16_t i, j; - size_t reg_num; +- int reg_num; +- int i, j; ++ size_t reg_num; @@ -45 +36 @@ -index bad65fcbed..c2e692a2c5 100644 +index 767e3728f1..169bad1412 100644