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 3764D46A9C for ; Mon, 30 Jun 2025 14:26:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 329954025D; Mon, 30 Jun 2025 14:26:03 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id B91F64025D for ; Mon, 30 Jun 2025 14:26:00 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-45363645a8eso29690305e9.1 for ; Mon, 30 Jun 2025 05:26:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751286360; x=1751891160; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HpjEe8Gs3sFnKEN915CjmGNUdoLfUVz29a/yeZBj31U=; b=V+Pm1EgFPIEBjuG3GC2ZJ9IbEcgGS026SxtOVGwBjnflWIjKujt6S3cie0PeE1AQYe g96U929uhouGzh+TovD5KKNP9hlGpTd7/N6te19gbdUHR1Ghszn4w3EFvoq0qE2+u3In ZrRxz1o+C/4au3Uuiq/pY1FcUWupNjjNEM2J10zlegRzi04kbuJSwT9FwjoCv1F3neMH qywqJnkXbsuKtdpoVqw/VtrsgTnF/ldZOpqco7L58LSprgRnRoIJMlwn4O/iHZiJkiCx w0JZpqQfcGqzzb6m6u8ayqscdbEULnenTr9cfCnS2lG5C+X3zKjOzvuGJUgX3xusd9Aq 6Ikw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751286360; x=1751891160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HpjEe8Gs3sFnKEN915CjmGNUdoLfUVz29a/yeZBj31U=; b=K8FSBYKVvGtX2MMp9DQ6IrEGfMnqABrXhG6bsCvhKpCwbFJIzSk4esjWZhqmlOC8Pf Mtipxn9DMIAGgzXyAy51yNdMpqeBBmLW3rCx9c/y9G6Qt3WI2zSSxjuuS8I/71G51m4l sdDNnHBBsoN2BUtDEpt3i1iccvW28w2Qzu8FFz2BjL6Rr7WRlbz1GpNy41MsLD8kjwpv SQU4aSMrJ2u7iw9snOK5lcjVjiOSv0lUL6IjvUp5J1LYHuaCsryge1Mo1YUHLt6qissp a88t1b8v/OdvnFeO0GpfyiLa6DRj7zlCqrxZF8ej2q6Qy6qN8azpWljeaS+SqWNMk5+i 5FOw== X-Forwarded-Encrypted: i=1; AJvYcCUDTjnXlFneOj3UQVYM8qjCurAb8kBw34tHMCBgP1GzhZaQuLzB0V0imfrFcIg+FDICncP5N7k=@dpdk.org X-Gm-Message-State: AOJu0YzK9w6KqqiYJV5n4gBoyuS+o6nbE3tlKGYVR5J2iJv+BMoCZpTA 41g7oRmxXORD2VR3PocRUkji0dDC9jDFpnIBl8ur8PE24/WmIWEo7q6o2zfFDyGy X-Gm-Gg: ASbGncvMfbb37d14SGPVBHD3kruzunbK38p4NeYKeNMPiWLZzTahXEmQ7GUm3arUX4I /issr72oQpz0DBGTbrx1Pw+Ebb5w73zV+1eomOQouQXTwnvxBBix4R57TuViGSqWZrjt5SfW9WG EJX7czSsbIH+weEX4rqBYDsY0md3lgeQQ6OuwwIqZ8U7Z08xu4fXwLwzoWfBFMxYCTWgzxFxi6B coccnFBnKvgEIVzgv8CqI9ilOenE+0NiZQKOBVx/O/w1D1vO3qtF6q6a9dLu5LKxS8i/KZepfJK AuPiTu1QeBmL1Yg3oatTa5LIBK3CzJnv0Z1ejNmOhsqiYoR7QVI8d388wRyNT/Kt/nw= X-Google-Smtp-Source: AGHT+IEPW8vjWhHHVydtXk4DyhbYyIydBdM0PnE2o35IC9uQGWJa0e8NGAnPauq9Squ7Tm/0kw6noQ== X-Received: by 2002:a05:600c:c172:b0:440:9b1a:cd78 with SMTP id 5b1f17b1804b1-4538ee3458amr164407855e9.10.1751286359992; Mon, 30 Jun 2025 05:25:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:ded1:f637:68f:c2a6]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a892e5f8a0sm10440027f8f.96.2025.06.30.05.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 05:25:59 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.9 Date: Mon, 30 Jun 2025 13:25:32 +0100 Message-ID: <20250630122556.1133654-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250630122556.1133654-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-72-luca.boccassi@gmail.com> <20250630122556.1133654-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.9 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ab74ac87bc7fe0554e3a2e0e6c94558647b9770d Thanks. Luca Boccassi --- >From ab74ac87bc7fe0554e3a2e0e6c94558647b9770d 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 7e6ada5733..9a89b1a12e 100644 --- a/.mailmap +++ b/.mailmap @@ -736,6 +736,7 @@ Kevin Scott Kevin Traynor Ke Xu Ke Zhang +Khadem Ullah <14pwcse1224@uetpeshawar.edu.pk> Khoa To Kiran KN Kiran Kumar K diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index d11e39431f..f3a76f9e93 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -16950,6 +16950,11 @@ flow_dv_query(struct rte_eth_dev *dev, error); 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; default: -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-30 13:21:21.850344929 +0100 +++ 0002-net-mlx5-fix-crash-on-age-query-with-indirect-conntr.patch 2025-06-30 13:21:21.739057181 +0100 @@ -1 +1 @@ -From 3bb6e3bf05284f0668e2ac14ce4b90a2909dff99 Mon Sep 17 00:00:00 2001 +From ab74ac87bc7fe0554e3a2e0e6c94558647b9770d 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 7e6ada5733..9a89b1a12e 100644 @@ -48 +49 @@ -@@ -812,6 +812,7 @@ Kevin Scott +@@ -736,6 +736,7 @@ Kevin Scott @@ -55 +56 @@ - Kiran Kumar K + Kiran Kumar K @@ -57 +58 @@ -index d555a9cdcb..7b9e5018b8 100644 +index d11e39431f..f3a76f9e93 100644 @@ -60 +61 @@ -@@ -18146,6 +18146,11 @@ flow_dv_query(struct rte_eth_dev *dev, +@@ -16950,6 +16950,11 @@ flow_dv_query(struct rte_eth_dev *dev,