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 91D7242B71; Mon, 22 May 2023 15:20:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05FE342D44; Mon, 22 May 2023 15:20:05 +0200 (CEST) Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by mails.dpdk.org (Postfix) with ESMTP id 7DDCB410D7; Mon, 22 May 2023 15:20:00 +0200 (CEST) Received: from kwepemi500017.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4QPygr2jVvzLmJy; Mon, 22 May 2023 21:18:32 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 22 May 2023 21:19:58 +0800 From: Dongdong Liu To: , , , , CC: , , , , Subject: [PATCH v2 3/5] net/hns3: fix loop code variable type mismatch Date: Mon, 22 May 2023 21:17:38 +0800 Message-ID: <20230522131740.30043-4-liudongdong3@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20230522131740.30043-1-liudongdong3@huawei.com> References: <20230518112944.32276-1-liudongdong3@huawei.com> <20230522131740.30043-1-liudongdong3@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500017.china.huawei.com (7.221.188.110) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Dengdui Huang 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") Cc: stable@dpdk.org Signed-off-by: Dengdui Huang Signed-off-by: Dongdong Liu --- .mailmap | 1 + drivers/net/hns3/hns3_regs.c | 3 ++- drivers/net/hns3/hns3_stats.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 976e4ef6f8..e9a3d443dc 100644 --- a/.mailmap +++ b/.mailmap @@ -301,6 +301,7 @@ Deepak Khandelwal Deepak Kumar Jain Deirdre O'Connor Dekel Peled +Dengdui Huang Dennis Marinus Derek Chickles Des O Dea diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c index 33392fd1f0..5d6f92e4bb 100644 --- a/drivers/net/hns3/hns3_regs.c +++ b/drivers/net/hns3/hns3_regs.c @@ -294,8 +294,9 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data) struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); uint32_t *origin_data_ptr = data; uint32_t reg_offset; - uint16_t i, j; size_t reg_num; + uint16_t j; + size_t i; /* fetching per-PF registers values from PF PCIe register space */ reg_num = sizeof(cmdq_reg_addrs) / sizeof(uint32_t); diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index bad65fcbed..c2e692a2c5 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -317,7 +317,7 @@ hns3_update_mac_stats(struct hns3_hw *hw) uint32_t stats_iterms; uint64_t *desc_data; uint32_t desc_num; - uint16_t i; + uint32_t i; int ret; /* The first desc has a 64-bit header, so need to consider it. */ -- 2.22.0