[dpdk-stable] [PATCH] net/pcap: fix fd leak on uninit
Tengfei Zhang
zypscode at outlook.com
Tue Mar 2 17:51:30 CET 2021
pcap fd was opend when vdev probed,
but not closed when vdev removed.
Fixes: c956caa6eabf ("pcap: support port hotplug")
Cc: stable at dpdk.org
Signed-off-by: Tengfei Zhang <zypscode at outlook.com>
---
drivers/net/pcap/rte_eth_pcap.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 90f5d75ea..49b9a1f44 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -621,9 +621,11 @@ eth_dev_stop(struct rte_eth_dev *dev)
/* Special iface case. Single pcap is open and shared between tx/rx. */
if (internals->single_iface) {
- pcap_close(pp->tx_pcap[0]);
- pp->tx_pcap[0] = NULL;
- pp->rx_pcap[0] = NULL;
+ if (pp->tx_pcap[0] != NULL) {
+ pcap_close(pp->tx_pcap[0]);
+ pp->tx_pcap[0] = NULL;
+ pp->rx_pcap[0] = NULL;
+ }
goto status_down;
}
@@ -755,6 +757,8 @@ eth_dev_close(struct rte_eth_dev *dev)
PMD_LOG(INFO, "Closing pcap ethdev on NUMA socket %d",
rte_socket_id());
+ eth_dev_stop(dev);
+
rte_free(dev->process_private);
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
--
2.25.1
More information about the stable
mailing list