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 5C20B4625C for ; Tue, 18 Feb 2025 13:43:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50487402A0; Tue, 18 Feb 2025 13:43:39 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2072.outbound.protection.outlook.com [40.107.102.72]) by mails.dpdk.org (Postfix) with ESMTP id 2AD4C402A0 for ; Tue, 18 Feb 2025 13:43:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R9HzB++pOW0DhPCumTcEs9SdcmvQUaxw7S8vF4SOullLPRUVxfqyQm9+/OvjuEWLRI+omn5y/hEZNlPm14Y2nb020/XH/Tdh18ad7gUCMG+aNh6cU+GVvFJ2SjwDAl73oyIIxfQUrvDse7JHsWwUn1GgJB4JOTC+LYW3MI+jySAXkhCfNo8lcMu2ybF7DtMrm6cDPqqfY3PIWs+LesNIWLlIok6xditgvffJZIQVRmKwwifw7PEot+xlHPl9VermojFmLoqdllISWPtqBptsDh4Y6CP6KoabXnAUl4HX0HjR0Kb7liISk9SV+ZP8mWSw53f0JmANZUdEc36576GMZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=yS1xanM+Eatodv1vHK1O4eJhrR7Pic8McEaiGbv49iU=; b=H6xDM4tPwabWz159vn4IAFUCIzbRxE7nFt2MZwc3zWVJ2N6GE0etTjHNq2/jCjztsWlEsoq5MzqAEfKIRp8aMCPKkDIMeQSk4XUsr2Y668GZkBuDn/jbmN2JDBnqEOAylkF05VzkpdEOtr6lmcc1IkSUYdH28w+S/RHaEHVk2QdS2BAHnm/a7RLMo9VbUkrt1ecyqV2Eq3vPvRRJ7X9RXrnyOVQ9Z/Wp/+f7d5kL2tEp6VMfJZ3X3o8QnAr9DmYSi3xtrU+bQA/UJ8CukBamL8Uar8TprLEL5iydK/KhdHiOK11VoT4R/6d42FromoegQ28ee7pnYDgK80jj62iVKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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 (0) 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=yS1xanM+Eatodv1vHK1O4eJhrR7Pic8McEaiGbv49iU=; b=ZUQ6ij+YdQNsCiQzxFvKu/5NRIbmeDUOgqt7Dqkwf2eNsIkyKdSnJpYKJB40umAE/qpLfCJdMvNDwtoZzTXUdXgaxQ7InyokVnmj8l4IKSGgCkPRCyLuyxub+oZ27Ro7jk1OJIK68KtCyiGRtWaBOVsXT5nQsETbl78y05tVBR9BIaPtHlegXHKB/UcrFsfTq0BbLFBGZqXJynM+GOVZE39TZveJkGJE9c3n2S7OmnJjwwXrcuNSZsnwN4REZrBqlLVkIkkyrL2nRyygQv01hhXaI8aSPH1ANI3Ix0PJuFNrKn/MHRpenjjFalGfTr5IDExx5yZZDFknpJoPqk6B5Q== Received: from BY5PR17CA0041.namprd17.prod.outlook.com (2603:10b6:a03:167::18) by DM6PR12MB4124.namprd12.prod.outlook.com (2603:10b6:5:221::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:43:33 +0000 Received: from SJ1PEPF00002323.namprd03.prod.outlook.com (2603:10b6:a03:167:cafe::9d) by BY5PR17CA0041.outlook.office365.com (2603:10b6:a03:167::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.16 via Frontend Transport; Tue, 18 Feb 2025 12:43:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00002323.mail.protection.outlook.com (10.167.242.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:43:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:43:24 -0800 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.1544.14; Tue, 18 Feb 2025 04:43:22 -0800 From: Xueming Li To: Stephen Hemminger CC: , dpdk stable Subject: patch 'net/hinic: fix flow type bitmask overflow' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:13 +0800 Message-ID: <20250218123523.36836-79-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002323:EE_|DM6PR12MB4124:EE_ X-MS-Office365-Filtering-Correlation-Id: 176e514d-ded0-4efc-6576-08dd5019dad7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RXojp5DCacZdUIupGRdGFRmZHMCBTjP7X4T9kKayU5NYOmQ5AUwqg8KJ9yjF?= =?us-ascii?Q?WLrt7kXzRXfAi+pK3/P+KIwkHqIplchILVBEh89vN+jrJ4y1G1kUZt9oL1dg?= =?us-ascii?Q?YKnh2GDJfOqcn4qMXbXJqWCOtbYdg0WH7/EYCi/oz1Z80su38JXRKPd3ZaBV?= =?us-ascii?Q?CGj/yvmdt8fAfzcoabpaThzLSyjlbSvIz0QSxalsMBlDYUaZuGYj47HiL4W3?= =?us-ascii?Q?TI7uHO3AzKo74KMzHcKjsimu6sPHld0wAbnkXmqawr8bDD+HhVy24FVC6Dys?= =?us-ascii?Q?oI2XO5hKrV4qQEaruAvM5UN7cWjja1MKaCiMFcgnweTh8NTqSojORCTBWhGE?= =?us-ascii?Q?KW6KSukNc4ZdTZtdeKXUTXbhCmPMuGfuEq+Zb7YCCzQ5/NAYYKbGrDToP31G?= =?us-ascii?Q?lDAOg55B4GRkLkC1Wk9MtaBH/0L/Y/cIVEOJt1e/wPt/CHMJP9f6y8U7H07x?= =?us-ascii?Q?mCR87Qgw6BEwX9QWgrLzjt2ff3MQkwop4qB1kPgvLeTPJLWWY44O49XzrxNn?= =?us-ascii?Q?dBw1C+tH227206daZ3X9ELyhfFRfaPM/25ScG4JYb3IalpZBr5eju8KkroiF?= =?us-ascii?Q?xfAUmtUm5HTtL7EOIkqlVwv2/a7yhTDQknL3LLm5p9ReYwQHfLZH+UTmYD7Y?= =?us-ascii?Q?SEnc1hzDtTCmW0w+Fu79eR9mjqECctih5vy9SNrOgaQTICsq/WYawapk7MTA?= =?us-ascii?Q?qZX+vRXOA+Q8qsLY9MrBNA6vT0UKHu/FmI86gSEJ9ua7+0eDKnCKUvFRPWWq?= =?us-ascii?Q?CTcXYhyTYwpKultAZ2mwT3mS0am86C/ZHFRWYiHsIDsGjeDk7IpWPCJX9p8O?= =?us-ascii?Q?f4c9rygvIHnannVWAwCyU8sUyUPbgAh4B5xVaYuWhFQiiXGD3Na0upJYSOAW?= =?us-ascii?Q?xcvI4BP7mE/AnQyakv3AG14nKla3fj/7iNTG1FzRqsfnuC/22rZ8J+w9RqMh?= =?us-ascii?Q?6nB6dLT1Vfca3FinOmfaAerVcbFZR4RK6aEsIKV6LbIjrAHXNuv5Lt26ruQ0?= =?us-ascii?Q?lqY33R83YRey8tgM6HTdVSuF4nH5tUGSFA/mZ/xk5qAio4Rb8cGSsCnymgH1?= =?us-ascii?Q?axwRdvIflYWrw1/cPOEcxS0Ii44JJvB9wnlp8DKdzMaZ8a03GqeihdLna46M?= =?us-ascii?Q?rVBQxflwX33Y0xKC4X9Qqu73IggLaCyLuN57d7uDTeOx7LyswRXYMfDYu+bs?= =?us-ascii?Q?hlDnJaTxucFMjxcdZhYfbSYfZUJdP/s8kjQuD3OVO/Gwkm+8W2t6DI3Yz550?= =?us-ascii?Q?rF7jzU8OyxiCcAR8AIdFvHzJsU7iYvbx2tORP+v6uhosPZC0PQsw8LNp/j1n?= =?us-ascii?Q?il1HxVgzMY1bteANA/PHp7JY03zRO43oBG/Ksx+m3qi2RctfoyQR2EVjYn1B?= =?us-ascii?Q?YMR5d2/XjYx9yLmFcxaM4BvCHIX5AqmUOPn0oL8BpmsSVh2tebHfGyca424r?= =?us-ascii?Q?54MwG3HNI/ZV6zXN3BsNBL5i6bYAe0Yujo5qoh/7lhmwcf4TR8dkdvJ7a1Lr?= =?us-ascii?Q?ZH+ziS3WXlvbcjw=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:43:33.2119 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 176e514d-ded0-4efc-6576-08dd5019dad7 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00002323.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4124 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c7fe575456e57cd305d332209e0944f664877746 Thanks. Xueming Li --- >From c7fe575456e57cd305d332209e0944f664877746 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:12 -0800 Subject: [PATCH] net/hinic: fix flow type bitmask overflow Cc: Xueming Li [ upstream commit a357d5b703253b5920aba808a24877386a22720e ] The type mask is 64 bit value, doing a shift of literal 1 (32 bit) will result in int type (32 bit) and cause truncation. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: f4ca3fd54c4d ("net/hinic: create and destroy flow director filter") Signed-off-by: Stephen Hemminger --- drivers/net/hinic/hinic_pmd_flow.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/hinic/hinic_pmd_flow.c b/drivers/net/hinic/hinic_pmd_flow.c index d1a564a163..9441525aa2 100644 --- a/drivers/net/hinic/hinic_pmd_flow.c +++ b/drivers/net/hinic/hinic_pmd_flow.c @@ -1979,8 +1979,8 @@ static int hinic_lookup_new_filter(struct hinic_5tuple_filter *filter, return -EINVAL; } - if (!(filter_info->type_mask & (1 << type_id))) { - filter_info->type_mask |= 1 << type_id; + if (!(filter_info->type_mask & (UINT64_C(1) << type_id))) { + filter_info->type_mask |= UINT64_C(1) << type_id; filter->index = type_id; filter_info->pkt_filters[type_id].enable = true; filter_info->pkt_filters[type_id].pkt_proto = @@ -2138,7 +2138,7 @@ static void hinic_remove_5tuple_filter(struct rte_eth_dev *dev, filter_info->pkt_type = 0; filter_info->qid = 0; filter_info->pkt_filters[filter->index].qid = 0; - filter_info->type_mask &= ~(1 << (filter->index)); + filter_info->type_mask &= ~(UINT64_C(1) << filter->index); TAILQ_REMOVE(&filter_info->fivetuple_list, filter, entries); rte_free(filter); @@ -2268,8 +2268,8 @@ hinic_ethertype_filter_insert(struct hinic_filter_info *filter_info, if (id < 0) return -EINVAL; - if (!(filter_info->type_mask & (1 << id))) { - filter_info->type_mask |= 1 << id; + if (!(filter_info->type_mask & (UINT64_C(1) << id))) { + filter_info->type_mask |= UINT64_C(1) << id; filter_info->pkt_filters[id].pkt_proto = ethertype_filter->pkt_proto; filter_info->pkt_filters[id].enable = ethertype_filter->enable; @@ -2289,7 +2289,7 @@ hinic_ethertype_filter_remove(struct hinic_filter_info *filter_info, return; filter_info->pkt_type = 0; - filter_info->type_mask &= ~(1 << idx); + filter_info->type_mask &= ~(UINT64_C(1) << idx); filter_info->pkt_filters[idx].pkt_proto = (uint16_t)0; filter_info->pkt_filters[idx].enable = FALSE; filter_info->pkt_filters[idx].qid = 0; @@ -2355,7 +2355,7 @@ hinic_add_del_ethertype_filter(struct rte_eth_dev *dev, if (i < 0) return -EINVAL; - if ((filter_info->type_mask & (1 << i))) { + if ((filter_info->type_mask & (UINT64_C(1) << i))) { filter_info->pkt_filters[i].enable = FALSE; (void)hinic_set_fdir_filter(nic_dev->hwdev, filter_info->pkt_type, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:03.416644567 +0800 +++ 0078-net-hinic-fix-flow-type-bitmask-overflow.patch 2025-02-18 19:39:00.718244032 +0800 @@ -1 +1 @@ -From a357d5b703253b5920aba808a24877386a22720e Mon Sep 17 00:00:00 2001 +From c7fe575456e57cd305d332209e0944f664877746 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a357d5b703253b5920aba808a24877386a22720e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 8fdd5a35be..6b1ca6ff88 100644 +index d1a564a163..9441525aa2 100644