[dpdk-stable] patch 'vhost: fix slave request fd leak' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

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

Thanks.

Luca Boccassi

---
>From 72baa70cdbf5b75dc14548f02923e23eb84bca71 Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Thu, 5 Sep 2019 19:01:25 +0800
Subject: [PATCH] vhost: fix slave request fd leak

[ upstream commit 761d57651c51365354cefb624883fccf62aee67d ]

We need to close the old slave request fd if any first
before taking the new one.

Fixes: 275c3f944730 ("vhost: support slave requests channel")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/vhost_user.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 155394a6d9..221217c3f4 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1177,6 +1177,9 @@ vhost_user_set_req_fd(struct virtio_net *dev, struct VhostUserMsg *msg)
 		return -1;
 	}
 
+	if (dev->slave_req_fd >= 0)
+		close(dev->slave_req_fd);
+
 	dev->slave_req_fd = fd;
 
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:27.408464899 +0000
+++ 0027-vhost-fix-slave-request-fd-leak.patch	2019-12-19 14:32:25.673289259 +0000
@@ -1,13 +1,14 @@
-From 761d57651c51365354cefb624883fccf62aee67d Mon Sep 17 00:00:00 2001
+From 72baa70cdbf5b75dc14548f02923e23eb84bca71 Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Thu, 5 Sep 2019 19:01:25 +0800
 Subject: [PATCH] vhost: fix slave request fd leak
 
+[ upstream commit 761d57651c51365354cefb624883fccf62aee67d ]
+
 We need to close the old slave request fd if any first
 before taking the new one.
 
 Fixes: 275c3f944730 ("vhost: support slave requests channel")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -16,11 +17,11 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
-index 0b72648a5a..f468436103 100644
+index 155394a6d9..221217c3f4 100644
 --- a/lib/librte_vhost/vhost_user.c
 +++ b/lib/librte_vhost/vhost_user.c
-@@ -1564,6 +1564,9 @@ vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg,
- 		return RTE_VHOST_MSG_RESULT_ERR;
+@@ -1177,6 +1177,9 @@ vhost_user_set_req_fd(struct virtio_net *dev, struct VhostUserMsg *msg)
+ 		return -1;
  	}
  
 +	if (dev->slave_req_fd >= 0)
@@ -28,7 +29,7 @@
 +
  	dev->slave_req_fd = fd;
  
- 	return RTE_VHOST_MSG_RESULT_OK;
+ 	return 0;
 -- 
 2.20.1