[dpdk-stable] patch 'net/vhost: fix potential memory leak on close' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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/03/20. 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://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a99aae61bec83b99d3fc8423c5246dd3514fb052

Thanks.

Kevin.

---
>From a99aae61bec83b99d3fc8423c5246dd3514fb052 Mon Sep 17 00:00:00 2001
From: Itsuro Oda <oda at valinux.co.jp>
Date: Thu, 5 Mar 2020 11:54:50 +0900
Subject: [PATCH] net/vhost: fix potential memory leak on close

[ upstream commit 770fabcd36ec11d64544e86ed7d2dda9f5c64daf ]

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")

Signed-off-by: Itsuro Oda <oda at valinux.co.jp>
Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/vhost/rte_eth_vhost.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 52b9e0c102..93ca8ebe4b 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -986,14 +986,12 @@ 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)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:02.897922825 +0100
+++ 0073-net-vhost-fix-potential-memory-leak-on-close.patch	2020-05-28 17:12:59.155555179 +0100
@@ -1 +1 @@
-From 770fabcd36ec11d64544e86ed7d2dda9f5c64daf Mon Sep 17 00:00:00 2001
+From a99aae61bec83b99d3fc8423c5246dd3514fb052 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 770fabcd36ec11d64544e86ed7d2dda9f5c64daf ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index f44e6bbebe..808e670f13 100644
+index 52b9e0c102..93ca8ebe4b 100644
@@ -23 +24 @@
-@@ -1070,14 +1070,12 @@ eth_dev_close(struct rte_eth_dev *dev)
+@@ -986,14 +986,12 @@ eth_dev_close(struct rte_eth_dev *dev)