net/vhost: fix potential memory leak on close
authorItsuro Oda <oda@valinux.co.jp>
Thu, 5 Mar 2020 02:54:50 +0000 (11:54 +0900)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 21 Apr 2020 11:57:07 +0000 (13:57 +0200)
If a vhost device is closed before eth_dev_configure is done
to the device, internal resources allocated to the device
would not be freed. This patch fixes it.

Fixes: 3d01b759d267 ("net/vhost: delay driver setup")
Cc: stable@dpdk.org
Signed-off-by: Itsuro Oda <oda@valinux.co.jp>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
drivers/net/vhost/rte_eth_vhost.c

index f44e6bb..808e670 100644 (file)
@@ -1069,16 +1069,14 @@ eth_dev_close(struct rte_eth_dev *dev)
 
        eth_dev_stop(dev);
 
-       rte_vhost_driver_unregister(internal->iface_name);
-
        list = find_internal_resource(internal->iface_name);
-       if (!list)
-               return;
-
-       pthread_mutex_lock(&internal_list_lock);
-       TAILQ_REMOVE(&internal_list, list, next);
-       pthread_mutex_unlock(&internal_list_lock);
-       rte_free(list);
+       if (list) {
+               rte_vhost_driver_unregister(internal->iface_name);
+               pthread_mutex_lock(&internal_list_lock);
+               TAILQ_REMOVE(&internal_list, list, next);
+               pthread_mutex_unlock(&internal_list_lock);
+               rte_free(list);
+       }
 
        if (dev->data->rx_queues)
                for (i = 0; i < dev->data->nb_rx_queues; i++)