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 4F3BC46211 for ; Thu, 13 Feb 2025 11:04:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AFC942EE7; Thu, 13 Feb 2025 11:04:01 +0100 (CET) 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 C041542EE7 for ; Thu, 13 Feb 2025 11:03:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441039; 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=DLvFNga1ZR6XJZncCoDDFizwL7qE0g/RqQ9Ih+N7TgM=; b=fUqFf7Khdko0ChiTUMI+KRUHjIZcgrXT0yVscIYIjhK5+DcuQJxuikl0m9+sGqMn+IXxhN c1Sv/q2KvrqsfpuNNrDk4Khn/jh2p8sdvCIpXPxvVr5qw8QbejoeKFYZBA7Cn4j2O3molo GYo6d5kY6Tl25DY5UWYUlxZPO8mQzu8= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-YaS-4hufOZuzqXaxpfpe1A-1; Thu, 13 Feb 2025 05:03:57 -0500 X-MC-Unique: YaS-4hufOZuzqXaxpfpe1A-1 X-Mimecast-MFC-AGG-ID: YaS-4hufOZuzqXaxpfpe1A_1739441037 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E6F201955F28; Thu, 13 Feb 2025 10:03:56 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BAF171800359; Thu, 13 Feb 2025 10:03:55 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/hinic: fix flow type bitmask overflow' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:17 +0000 Message-ID: <20250213095933.362078-110-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VvRChxBc4G-Q5rIhW__5nQ0IqmxR-bdVh-JUJQG1OC8_1739441037 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. 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/a38040c143eded29990f5794300e0b9e16c2fcab Thanks. Kevin --- >From a38040c143eded29990f5794300e0b9e16c2fcab 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 [ 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 8fdd5a35be..6b1ca6ff88 100644 --- a/drivers/net/hinic/hinic_pmd_flow.c +++ b/drivers/net/hinic/hinic_pmd_flow.c @@ -1980,6 +1980,6 @@ static int hinic_lookup_new_filter(struct hinic_5tuple_filter *filter, } - 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; @@ -2139,5 +2139,5 @@ static void hinic_remove_5tuple_filter(struct rte_eth_dev *dev, 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); @@ -2269,6 +2269,6 @@ hinic_ethertype_filter_insert(struct hinic_filter_info *filter_info, 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; @@ -2290,5 +2290,5 @@ hinic_ethertype_filter_remove(struct hinic_filter_info *filter_info, 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; @@ -2356,5 +2356,5 @@ hinic_add_del_ethertype_filter(struct rte_eth_dev *dev, 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, -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:46.142619041 +0000 +++ 0110-net-hinic-fix-flow-type-bitmask-overflow.patch 2025-02-12 17:29:34.634947624 +0000 @@ -1 +1 @@ -From a357d5b703253b5920aba808a24877386a22720e Mon Sep 17 00:00:00 2001 +From a38040c143eded29990f5794300e0b9e16c2fcab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a357d5b703253b5920aba808a24877386a22720e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org