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 3FFE742D46 for ; Sun, 25 Jun 2023 08:39:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3AA7C40ED8; Sun, 25 Jun 2023 08:39:57 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by mails.dpdk.org (Postfix) with ESMTP id 72E4140A7F for ; Sun, 25 Jun 2023 08:39:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QwfaNEE7nmXj02Ae4chwH4asgwwnxSc0+5s+SF4m+u4bXMufKwe4hYgjosGfdebuSTjM+Lzdq9AfdHIdBzRxgkpoest9vMZ/oDbMjdaXoG7q9NAj9l8Sb9Hz6OcaHQASS9ijF1gb5BJqjuTAFXHRDcX+byRAdi4Avvnb5Nwm5OV2b1UnjMrdWEUkIhI7QXeR98II43CLVBbDEKq2wF+mENxHeeDirBsTqaUMutC1D8kss5WfZRI+40zy9emIbRRtxohKMitSl2pvw794nnOkA9XDk/psGTBbBYyid6LlWyVLyIiT4pxNUXAkLEYbhE3VnFFZf+okKMLaKpfAKm0ZVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q8B0YJpSTrVE0fG+Fgv6tA62Kh+J/Fqo1MtDzPj1BRc=; b=JW5nJGLTHWREKRZ2ZWYfGVj+l9eKF3Y0Ys2PiEx2rtdNXQ1nfEh1bmtyu/ZhZD+qRbyq+IR6VwURHv0O5/eDqUW1uZw20tOOrQSUv/FsxuTSfzAI4gqugDIc8+nxfqFE1vTAD0/3oDZEa8hOOxeltUHvHtlXyNwdNQ009xD8oxAQrVyCK0J/OeOID9bpbh39nAC+Jzev2SpOisUub9a6bG9OWVtKiM7JePdVAQUfLrc3R08kLqbMFP+o+OKZ4e5bSw/EMIU8EoXVAPpLQE95CkiqvTcD1VNcUNMj5wt6RT9y01OQsa+7cP7CW8i1jCCTvyrUljuT1eaeR+bj82ukFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q8B0YJpSTrVE0fG+Fgv6tA62Kh+J/Fqo1MtDzPj1BRc=; b=De3SoW21fpWqN81/niLmvIuW6BsoctHTZND+f/SAWWi8oeiMjwbSxg8XIvYnFOuDs9dTXVz8uZp850D92JJbgqnRPBqBo2bk+6nBQgnzmeoJBHoQHHVCmi0ksf6rWvHxsp22dol3hxtPZqkeV9S9zkpeAsYQitbXA4j9hom+XZBfQeBuEct0bpegFLwvsq7f+U0c8pw6EsYKPsjGejbCmJvOu8Jg3g1+frIpzNmgxMyxLSQKTyFSezOy2MCW/MHgYXjAStmVRusJWWDrI1sIIwtvSUb/m5n4oSIk8E9ZYWbRREIZpEDgnpTuyhRWsABywqyoBH5S8Hd/asCx+u3mzg== Received: from DS7PR03CA0204.namprd03.prod.outlook.com (2603:10b6:5:3b6::29) by MN2PR12MB4342.namprd12.prod.outlook.com (2603:10b6:208:264::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:39:53 +0000 Received: from DM6NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b6:cafe::4b) by DS7PR03CA0204.outlook.office365.com (2603:10b6:5:3b6::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:39:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT060.mail.protection.outlook.com (10.13.173.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:39:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:39:35 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:39:34 -0700 From: Xueming Li To: Dengdui Huang CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix variable type mismatch' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:34:19 +0800 Message-ID: <20230625063544.11183-42-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT060:EE_|MN2PR12MB4342:EE_ X-MS-Office365-Filtering-Correlation-Id: aea9c371-0dc1-4e04-b51f-08db7546faca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YJAI7qjVa6o12sE9OzXl11g3wIuyHJXoAgUeT4GZzn8Ph9eSI7FRxDqCBWijzZb6ynLhy1rkZudkmci06u9EaSgQ/iTo821zQOSEOZh0gjx+85o1Z1VQzTOs6N+ef1g9yLhniqo5PfPsWorFgnmlhPJlQpS+ZjUa/C0RAaFL5LB4VAzazulk/4fJwZ6tfXcwyVOGHQfjakt8npDOZxljF67cN1bOaD0C+3NE6E33p8oCGpDDMx1GFKr/AkE3C8my/Ht/s6+M3TgNVWcrIz7y9znbsulw780gOZBa3L8MM6IGe2R8D1HjnYhb+6S9OTpzto0Yrm5SXaHUusriFqfrAP691eqRbPN/B5ktHkgKKHwufvQ3vs/0NtlThadKvYbscYkBENRGLC3cUVX1MRFZioYVneDZ5ItmLi0+WSuDTrtYbHwRNb+Dw/iFAjJCTK9bLVpOIS72QyGrb0Xh63fyK2UMP7UjI6kVgzbsSLQSnlakSC2kYIPKzeDqQGWeLOT6Wtu1knEgeFu3Q5sOo+R6WPH1mAKHatjWvRW833zD7dLY4l9SmAAdruGizVuEsXMGj6nRqBre9nhQjEWWWNo1LmcqiFBcp5XBV8IG7O7VRQDZniOLQH7m5aDGwLropVYp1ii0/hqbiXf/vNx2vTS2MQcyshlYTfpSp0tgDSNMShtrjix21f6ezQ/8uSjjtHmTL2CQZOVWLQ2x+U6C/U+iWYn4OQLBp+1IMAGjVL5PV2ivQqI83nzQ9hrGMnKEmLmhPgni7FhywkYwt6FLJ0H3Cg== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(376002)(396003)(136003)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(6666004)(54906003)(2616005)(426003)(83380400001)(336012)(53546011)(1076003)(26005)(6286002)(186003)(16526019)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(8936002)(8676002)(41300700001)(316002)(86362001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:39:51.7243 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aea9c371-0dc1-4e04-b51f-08db7546faca X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4342 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=f2dd43a6e92ab5fb9a99e2a2816141525ca9d5c2 Thanks. Xueming Li --- >From f2dd43a6e92ab5fb9a99e2a2816141525ca9d5c2 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 Cc: Xueming Li [ 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 --- .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 73f729c4c6..44d9bd97c6 100644 --- a/.mailmap +++ b/.mailmap @@ -298,6 +298,7 @@ Deepak Khandelwal Deepak Kumar Jain Deirdre O'Connor Dekel Peled +Dengdui Huang Denis Pryazhennikov Dennis Marinus Derek Chickles 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:59.627130100 +0800 +++ 0041-net-hns3-fix-variable-type-mismatch.patch 2023-06-25 14:31:58.345773900 +0800 @@ -1 +1 @@ -From 1bbac8785cdf51bc6c5005c6754eab4d517cc4b0 Mon Sep 17 00:00:00 2001 +From f2dd43a6e92ab5fb9a99e2a2816141525ca9d5c2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1bbac8785cdf51bc6c5005c6754eab4d517cc4b0 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 863dbecdb0..f00c1e5457 100644 +index 73f729c4c6..44d9bd97c6 100644 @@ -25 +27 @@ -@@ -301,6 +301,7 @@ Deepak Khandelwal +@@ -298,6 +298,7 @@ Deepak Khandelwal