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 685C246BAE for ; Fri, 18 Jul 2025 21:36:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 636B040611; Fri, 18 Jul 2025 21:36:44 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2C0EA40611 for ; Fri, 18 Jul 2025 21:36:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867402; 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=20TbPduK28VsBUlP9B8d64cNxl7DVCFQiWLC4mnYKSk=; b=ep8J0BTmerLIilP1SsYylsIwJ80vMa+lycNhYxhT4ZpGVBC0S7iMXlwTy8kgIrZsBYUBVP 5ONZVhdhVhmTxTdZa2nhGSTdgQrem3YBo1JboHsagAzIQvjTZ/LTVqVtUoEG2IEf6tNGSl LBWuPATaibjuIWxqt/+aJ2GdUTzzH4c= Received: from mx-prod-mc-04.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-266-oYSIFCIkOnirXdcbAa8qnA-1; Fri, 18 Jul 2025 15:36:37 -0400 X-MC-Unique: oYSIFCIkOnirXdcbAa8qnA-1 X-Mimecast-MFC-AGG-ID: oYSIFCIkOnirXdcbAa8qnA_1752867396 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8860619560A2; Fri, 18 Jul 2025 19:36:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 00F0018003FC; Fri, 18 Jul 2025 19:36:34 +0000 (UTC) From: Kevin Traynor To: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix crash on age query with indirect conntrack' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:40 +0100 Message-ID: <20250718193247.1008129-106-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-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: oyugHQ9s9SaVFvSE_waqBmWBu8IKAaSPjcJWUY6jQrE_1752867396 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.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 07/23/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/af137849d7691165c94a1f96d24edc10e2af9182 Thanks. Kevin --- >From af137849d7691165c94a1f96d24edc10e2af9182 Mon Sep 17 00:00:00 2001 From: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Date: Thu, 26 Jun 2025 09:07:02 -0400 Subject: [PATCH] net/mlx5: fix crash on age query with indirect conntrack [ upstream commit 3bb6e3bf05284f0668e2ac14ce4b90a2909dff99 ] This patch fixes a segmentation fault that occurs when querying the AGE action of a flow rule that uses indirect connection tracking (CT). Background: AGE and CT indices share a union in the mlx5 flow struct. When using CT without age, the age index is invalid. Querying AGE in this case leads to a crash due to reading an invalid pointer. Solution: Add a check in `flow_dv_query()` to prevent AGE queries on indirect CT actions. This is the correct fix rather than null-checking the pool. Steps to reproduce: 1. Create an indirect CT action: flow indirect_action 0 create ingress action conntrack / end 2. Create a root rule with jump: flow create 0 ingress pattern eth / ipv4 / tcp / end actions jump group 3 / end 3. Create a group 3 rule using the indirect action: flow create 0 group 3 ingress pattern eth / ipv4 / tcp / end actions indirect 0 / jump group 5 / end 4. Create a group 5 rule matching CT state: flow create 0 group 5 ingress pattern eth / ipv4 / tcp / conntrack is 1 / end actions queue index 5 / end 5. Querying the first rule causes segfault: flow query 0 1 age Fixes: 2d084f69aa26 ("net/mlx5: add translation of connection tracking action") Signed-off-by: Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Acked-by: Dariusz Sosnowski --- .mailmap | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.mailmap b/.mailmap index bd43f25315..6a039f1be3 100644 --- a/.mailmap +++ b/.mailmap @@ -805,4 +805,5 @@ Kevin Traynor Ke Xu Ke Zhang +Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Khoa To Kiran KN diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 9c52b7d25d..9fad6e8095 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -18133,4 +18133,9 @@ flow_dv_query(struct rte_eth_dev *dev, break; case RTE_FLOW_ACTION_TYPE_AGE: + if (flow->indirect_type == MLX5_INDIRECT_ACTION_TYPE_CT) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "age not available"); ret = flow_dv_query_age(dev, flow, data, error); break; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:14.690090582 +0100 +++ 0106-net-mlx5-fix-crash-on-age-query-with-indirect-conntr.patch 2025-07-18 20:29:11.040907668 +0100 @@ -1 +1 @@ -From 3bb6e3bf05284f0668e2ac14ce4b90a2909dff99 Mon Sep 17 00:00:00 2001 +From af137849d7691165c94a1f96d24edc10e2af9182 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3bb6e3bf05284f0668e2ac14ce4b90a2909dff99 ] + @@ -35 +36,0 @@ -Cc: stable@dpdk.org @@ -45 +46 @@ -index 8483d96ec5..6126f7e472 100644 +index bd43f25315..6a039f1be3 100644 @@ -48 +49 @@ -@@ -813,4 +813,5 @@ Kevin Traynor +@@ -805,4 +805,5 @@ Kevin Traynor @@ -55 +56 @@ -index d555a9cdcb..7b9e5018b8 100644 +index 9c52b7d25d..9fad6e8095 100644 @@ -58 +59 @@ -@@ -18147,4 +18147,9 @@ flow_dv_query(struct rte_eth_dev *dev, +@@ -18133,4 +18133,9 @@ flow_dv_query(struct rte_eth_dev *dev,