public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] i40e: add an error handling path in i40e_xsk_pool_enable()
@ 2026-01-31  5:52 Haoxiang Li
  2026-01-31  6:12 ` [Intel-wired-lan] [PATCH v2] i40e: add an error handling path in Kohei Enju
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Haoxiang Li @ 2026-01-31  5:52 UTC (permalink / raw)
  To: anthony.l.nguyen, przemyslaw.kitszel, andrew+netdev, davem,
	edumazet, kuba, pabeni, daniel, magnus.karlsson, bjorn
  Cc: intel-wired-lan, netdev, linux-kernel, Haoxiang Li, stable

In i40e_xsk_pool_enable(), add an error handling path to
prevent potential memory leaks.

Fixes: 1742b3d52869 ("xsk: i40e: ice: ixgbe: mlx5: Pass buffer pool to driver instead of umem")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
---
Changes in v2:
- Add a Fixes tag. Thanks, Paul!
- Replace unmap with i40e_xsk_pool_disable() to prevent
a limbo state of queues. Thanks, Maciej! 
---
 drivers/net/ethernet/intel/i40e/i40e_xsk.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 9f47388eaba5..a72a309540c3 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -108,23 +108,26 @@ static int i40e_xsk_pool_enable(struct i40e_vsi *vsi,
 	if (if_running) {
 		err = i40e_queue_pair_disable(vsi, qid);
 		if (err)
-			return err;
+			goto err_out;
 
 		err = i40e_realloc_rx_xdp_bi(vsi->rx_rings[qid], true);
 		if (err)
-			return err;
+			goto err_out;
 
 		err = i40e_queue_pair_enable(vsi, qid);
 		if (err)
-			return err;
+			goto err_out;
 
 		/* Kick start the NAPI context so that receiving will start */
 		err = i40e_xsk_wakeup(vsi->netdev, qid, XDP_WAKEUP_RX);
 		if (err)
-			return err;
+			goto err_out;
 	}
 
 	return 0;
+
+err_out:
+	i40e_xsk_pool_disable(vsi, qid);
 }
 
 /**
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2026-02-01  5:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-31  5:52 [PATCH v2] i40e: add an error handling path in i40e_xsk_pool_enable() Haoxiang Li
2026-01-31  6:12 ` [Intel-wired-lan] [PATCH v2] i40e: add an error handling path in Kohei Enju
2026-01-31  7:02   ` Kohei Enju
2026-01-31 15:44 ` [Intel-wired-lan] [PATCH v2] i40e: add an error handling path in i40e_xsk_pool_enable() kernel test robot
2026-01-31 15:50 ` kernel test robot
2026-01-31 16:33 ` kernel test robot
2026-02-01  5:44 ` kernel test robot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox