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 C6F3848A44 for ; Fri, 31 Oct 2025 15:36:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C039840150; Fri, 31 Oct 2025 15:36:50 +0100 (CET) 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 4E3C540655 for ; Fri, 31 Oct 2025 15:36:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921408; 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=dda9WzY8yTL/mgr/3SL6o5kACIlRvDGcABoY5HzPgtY=; b=hEKAdNMQlnUFXmEiQR9I++7re1sr0MjLPKlaEaEbS/chCLPAOJuJWMmDviCjhjP66l/tfn DBA0y5KKHRu2Ysgtn3XU3qT8JdVyUmFhT3TnV6hVjnkYeTg7+edGT0qLxJYdFC4sHZOhOf +EjiTKwsYXekOUF0nP+I4CWxh/xGBJM= 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-628-EPMwTRJxMtGlQu3u0MCMrQ-1; Fri, 31 Oct 2025 10:36:44 -0400 X-MC-Unique: EPMwTRJxMtGlQu3u0MCMrQ-1 X-Mimecast-MFC-AGG-ID: EPMwTRJxMtGlQu3u0MCMrQ_1761921403 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 37DEF1956078; Fri, 31 Oct 2025 14:36:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0ED261800596; Fri, 31 Oct 2025 14:36:40 +0000 (UTC) From: Kevin Traynor To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix double free in non-template flow destroy' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:38 +0000 Message-ID: <20251031143421.324432-36-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: sPiDr4yNizoWqaUKlHnW8waCPf40ozW_ANyYIKtYDBk_1761921403 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/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/045c791fdba69e31ae54edf5fe95e9afd77aafc0 Thanks. Kevin --- >From 045c791fdba69e31ae54edf5fe95e9afd77aafc0 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Thu, 7 Aug 2025 13:00:26 +0300 Subject: [PATCH] net/mlx5: fix double free in non-template flow destroy [ upstream commit 7867b5d7a545f32aa6e6c5b4b406434581a0166b ] Avoid calling flow_hw_unregister_matcher twice when rule creation fails due to insufficient memory, which previously caused a use-after-free error detected by ASan. As a preventative measure, clear released pointers in flow_hw_destroy to avoid potential double-free issues. Fixes: b2845d51c748 ("net/mlx5: support FDB in non-template flow") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 370f0374d6..0d0262a275 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -13834,9 +13834,4 @@ error: if (hw_act.mhdr) mlx5_free(hw_act.mhdr); - if (ret) { - /* release after actual error */ - if ((*flow)->nt2hws && (*flow)->nt2hws->matcher) - flow_hw_unregister_matcher(dev, (*flow)->nt2hws->matcher); - } return ret; } @@ -13856,4 +13851,5 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) if (ret) DRV_LOG(ERR, "bwc rule destroy failed"); + flow->nt2hws->nt_rule = NULL; } flow->operation_type = MLX5_FLOW_HW_FLOW_OP_TYPE_DESTROY; @@ -13870,16 +13866,22 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) * , same as for DV. */ - if (flow->nt2hws->flow_aux) + if (flow->nt2hws->flow_aux) { mlx5_free(flow->nt2hws->flow_aux); - - if (flow->nt2hws->rix_encap_decap) + flow->nt2hws->flow_aux = NULL; + } + if (flow->nt2hws->rix_encap_decap) { flow_encap_decap_resource_release(dev, flow->nt2hws->rix_encap_decap); + flow->nt2hws->rix_encap_decap = 0; + } if (flow->nt2hws->modify_hdr) { MLX5_ASSERT(flow->nt2hws->modify_hdr->action); mlx5_hlist_unregister(priv->sh->modify_cmds, &flow->nt2hws->modify_hdr->entry); + flow->nt2hws->modify_hdr = NULL; } - if (flow->nt2hws->matcher) + if (flow->nt2hws->matcher) { flow_hw_unregister_matcher(dev, flow->nt2hws->matcher); + flow->nt2hws->matcher = NULL; + } } -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:53.382234792 +0000 +++ 0036-net-mlx5-fix-double-free-in-non-template-flow-destro.patch 2025-10-31 13:53:52.096523556 +0000 @@ -1 +1 @@ -From 7867b5d7a545f32aa6e6c5b4b406434581a0166b Mon Sep 17 00:00:00 2001 +From 045c791fdba69e31ae54edf5fe95e9afd77aafc0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7867b5d7a545f32aa6e6c5b4b406434581a0166b ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 0c3f554479..3da8d93454 100644 +index 370f0374d6..0d0262a275 100644 @@ -26 +27 @@ -@@ -14095,9 +14095,4 @@ error: +@@ -13834,9 +13834,4 @@ error: @@ -36 +37 @@ -@@ -14117,4 +14112,5 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) +@@ -13856,4 +13851,5 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) @@ -42 +43 @@ -@@ -14131,16 +14127,22 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) +@@ -13870,16 +13866,22 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) @@ -67,2 +68,2 @@ - if (flow->nt2hws->sample_release_ctx != NULL) { - mlx5_nta_sample_mirror_entry_release(dev, flow->nt2hws->sample_release_ctx); + } +