net/pcap: fix fd leak on uninit
Checks
Commit Message
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>
---
drivers/net/pcap/rte_eth_pcap.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Comments
On 3/2/2021 4:51 PM, Tengfei Zhang wrote:
> 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>
Applied to dpdk-next-net/main, thanks.
@@ -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)