patch 'net/nfp: fix null dereference in flower ctrl NFD3 Tx' has been queued to stable release 24.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/13/26. 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/2456ca661c991c883edf45452170ac5d2eb2d2d8

Thanks.

Luca Boccassi

---
>From 2456ca661c991c883edf45452170ac5d2eb2d2d8 Mon Sep 17 00:00:00 2001
From: Denis Sergeev <denserg.edu at gmail.com>
Date: Wed, 3 Jun 2026 08:51:56 +0300
Subject: [PATCH] net/nfp: fix null dereference in flower ctrl NFD3 Tx

[ upstream commit 86252c32586d37dfb401a57ad53d46e0c121e10c ]

In nfp_flower_ctrl_vnic_nfd3_xmit(), when txq is NULL, goto xmit_end
leads to unconditional dereference of txq->qcp_q in nfp_qcp_ptr_add().
The same goto from the "no free descriptors" path incorrectly increments
the hardware write pointer despite no descriptor being written.

Replace both gotos with early return, removing the unused xmit_end label.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: a36634e87e16 ("net/nfp: add flower ctrl VNIC Rx/Tx")

Signed-off-by: Denis Sergeev <denserg.edu at gmail.com>
---
 .mailmap                                 | 1 +
 drivers/net/nfp/flower/nfp_flower_ctrl.c | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index b2ec53bcde..4d61c77c43 100644
--- a/.mailmap
+++ b/.mailmap
@@ -363,6 +363,7 @@ Dekel Peled <dekelp at nvidia.com> <dekelp at mellanox.com>
 Dengdui Huang <huangdengdui at huawei.com>
 Denis Lyulin <lyulin.2003 at mail.ru>
 Denis Pryazhennikov <denis.pryazhennikov at arknetworks.am>
+Denis Sergeev <denserg.edu at gmail.com>
 Dennis Marinus <dmarinus at amazon.com>
 Derek Chickles <derek.chickles at caviumnetworks.com>
 Des O Dea <des.j.o.dea at intel.com>
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index 6ac2caf367..1fa751a106 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -168,7 +168,7 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower *app_fw_flower,
 		 * enabled. But the queue needs to be configured.
 		 */
 		PMD_TX_LOG(ERR, "Ctrl dev TX Bad queue.");
-		goto xmit_end;
+		return 0;
 	}
 
 	txds = &txq->txds[txq->wr_p];
@@ -183,7 +183,7 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower *app_fw_flower,
 	free_descs = nfp_net_nfd3_free_tx_desc(txq);
 	if (unlikely(free_descs == 0)) {
 		PMD_TX_LOG(ERR, "Ctrl dev no free descs.");
-		goto xmit_end;
+		return 0;
 	}
 
 	lmbuf = &txq->txbufs[txq->wr_p].mbuf;
@@ -207,7 +207,6 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower *app_fw_flower,
 	cnt++;
 	app_fw_flower->ctrl_vnic_tx_count++;
 
-xmit_end:
 	rte_wmb();
 	nfp_qcp_ptr_add(txq->qcp_q, NFP_QCP_WRITE_PTR, 1);
 
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-06-11 14:20:04.298773567 +0100
+++ 0075-net-nfp-fix-null-dereference-in-flower-ctrl-NFD3-Tx.patch	2026-06-11 14:20:01.310748315 +0100
@@ -1 +1 @@
-From 86252c32586d37dfb401a57ad53d46e0c121e10c Mon Sep 17 00:00:00 2001
+From 2456ca661c991c883edf45452170ac5d2eb2d2d8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 86252c32586d37dfb401a57ad53d46e0c121e10c ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 0b3197f9da..d1d9cd1743 100644
+index b2ec53bcde..4d61c77c43 100644
@@ -28 +29 @@
-@@ -377,6 +377,7 @@ Dekel Peled <dekelp at nvidia.com> <dekelp at mellanox.com>
+@@ -363,6 +363,7 @@ Dekel Peled <dekelp at nvidia.com> <dekelp at mellanox.com>