patch 'net/txgbe: fix use-after-free on remove' has been queued to stable release 22.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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 06/27/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=32e0eaa22b4adb5b17ffae452a4731386314a7ca

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 32e0eaa22b4adb5b17ffae452a4731386314a7ca Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Thu, 18 May 2023 15:11:24 +0800
Subject: [PATCH] net/txgbe: fix use-after-free on remove
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 0105788ebac6c796f30361912377550207084a17 ]

When cleaning up NIC's interrupts, it is possible to add some alarms
at the same time. However, if these alarms are not canceled, it may
cause use-after-free problems. Therefore, after cleaning up NIC's
interrupts, these alarms should also be canceled.

Fixes: d3bb4a04eac1 ("net/txgbe: add SFP hotplug identification")
Fixes: e0d876ef6bbc ("net/txgbe: support device stop and close")

Reported-by: Pengfei Sun <sunpengfei16 at huawei.com>
Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 .mailmap                         | 1 +
 drivers/net/txgbe/txgbe_ethdev.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index e9b5482002..8d8c19d582 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1034,6 +1034,7 @@ Pawel Rutkowski <pawelx.rutkowski at intel.com>
 Pawel Wodkowski <pawelwod at gmail.com> <pawelx.wodkowski at intel.com> <pawelx.wdkowski at intel.com>
 Pei Chao <peichao85 at gmail.com>
 Pei Zhang <pezhang at redhat.com>
+Pengfei Sun <sunpengfei16 at huawei.com>
 Peng He <hepeng.0320 at bytedance.com> <xnhp0320 at icloud.com>
 Peng Huang <peng.huang at intel.com>
 Peng Sun <peng.a.sun at intel.com>
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 55777cb10a..e0df734946 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2019,8 +2019,9 @@ txgbe_dev_close(struct rte_eth_dev *dev)
 		rte_delay_ms(100);
 	} while (retries++ < (10 + TXGBE_LINK_UP_TIME));
 
-	/* cancel the delay handler before remove dev */
+	/* cancel all alarm handler before remove dev */
 	rte_eal_alarm_cancel(txgbe_dev_interrupt_delayed_handler, dev);
+	rte_eal_alarm_cancel(txgbe_dev_setup_link_alarm_handler, dev);
 
 	/* uninitialize PF if max_vfs not zero */
 	txgbe_pf_host_uninit(dev);
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-06-25 14:31:59.489402500 +0800
+++ 0036-net-txgbe-fix-use-after-free-on-remove.patch	2023-06-25 14:31:58.325773900 +0800
@@ -1 +1 @@
-From 0105788ebac6c796f30361912377550207084a17 Mon Sep 17 00:00:00 2001
+From 32e0eaa22b4adb5b17ffae452a4731386314a7ca Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 0105788ebac6c796f30361912377550207084a17 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -20,2 +22,2 @@
- drivers/net/txgbe/txgbe_ethdev.c | 4 +++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ drivers/net/txgbe/txgbe_ethdev.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
@@ -24 +26 @@
-index c5dd75633d..034fb27843 100644
+index e9b5482002..8d8c19d582 100644
@@ -27 +29 @@
-@@ -1049,6 +1049,7 @@ Pawel Rutkowski <pawelx.rutkowski at intel.com>
+@@ -1034,6 +1034,7 @@ Pawel Rutkowski <pawelx.rutkowski at intel.com>
@@ -36 +38 @@
-index a502618bc5..a3d7461951 100644
+index 55777cb10a..e0df734946 100644
@@ -39 +41 @@
-@@ -2032,8 +2032,10 @@ txgbe_dev_close(struct rte_eth_dev *dev)
+@@ -2019,8 +2019,9 @@ txgbe_dev_close(struct rte_eth_dev *dev)
@@ -46 +47,0 @@
-+	rte_eal_alarm_cancel(txgbe_dev_detect_sfp, dev);