net/pcap: fix file descriptor leak on close
authorTengfei Zhang <zypscode@outlook.com>
Tue, 2 Mar 2021 16:51:30 +0000 (16:51 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 3 Mar 2021 13:53:57 +0000 (14:53 +0100)
pcap fd was opend when vdev probed,
but not closed when vdev removed.

Fixes: c956caa6eabf ("pcap: support port hotplug")
Cc: stable@dpdk.org
Signed-off-by: Tengfei Zhang <zypscode@outlook.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
drivers/net/pcap/rte_eth_pcap.c

index 2766745..28a5027 100644 (file)
@@ -682,9 +682,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) {
                queue_missed_stat_on_stop_update(dev, 0);
-               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;
        }
 
@@ -821,6 +823,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)