[dpdk-stable] patch 'vhost: fix device leak on connection add failure' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/13/19. 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/839d3d6aa1f1c26a7611d4086e51469569e9028d

Thanks.

Kevin Traynor

---
>From 839d3d6aa1f1c26a7611d4086e51469569e9028d Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets at samsung.com>
Date: Thu, 11 Apr 2019 13:23:06 +0300
Subject: [PATCH] vhost: fix device leak on connection add failure

[ upstream commit a21510e750430914a5638a8925e87609a32cbbff ]

Need to destroy allocated device if application fails to
add new connection or we have fdset failure.

Fixes: acbff5c67ea7 ("vhost: fix crash when exceeding file descriptors")
Fixes: efba12a78ddf ("vhost: add user callbacks for socket open/close")

Reported-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Jens Freimann <jfreimann at redhat.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 lib/librte_vhost/socket.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 9883b0491..c2bf023d1 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -241,5 +241,5 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
 				"failed to add vhost user connection with fd %d\n",
 				fd);
-			goto err;
+			goto err_cleanup;
 		}
 	}
@@ -258,5 +258,5 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
 			vsocket->notify_ops->destroy_connection(conn->vid);
 
-		goto err;
+		goto err_cleanup;
 	}
 
@@ -268,4 +268,6 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket)
 	return;
 
+err_cleanup:
+	vhost_destroy_device(vid);
 err:
 	free(conn);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:06.665890432 +0100
+++ 0016-vhost-fix-device-leak-on-connection-add-failure.patch	2019-05-08 11:05:05.791933556 +0100
@@ -1 +1 @@
-From a21510e750430914a5638a8925e87609a32cbbff Mon Sep 17 00:00:00 2001
+From 839d3d6aa1f1c26a7611d4086e51469569e9028d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a21510e750430914a5638a8925e87609a32cbbff ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 3da9de62c..f0fdb83f7 100644
+index 9883b0491..c2bf023d1 100644