[dpdk-stable] patch 'bus/vmbus: fix directory handle leak on error' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 4e6f5483695e6f2b596b3c64d66170860351904e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 6 Nov 2018 11:30:03 -0800
Subject: [PATCH] bus/vmbus: fix directory handle leak on error

[ upstream commit 6521c9a2f7e00b0fcee940e0570ee12fcd9ca8dc ]

If sysfs directory was incorrectly formatted then the vmbus
setup code would leak a directory handle in the error path.

Coverity issue: 302848
Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/bus/vmbus/linux/vmbus_uio.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index 856c6d667..12e97e3a4 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -330,4 +330,5 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 	struct dirent *ent;
 	DIR *chan_dir;
+	int err;
 
 	snprintf(chan_path, sizeof(chan_path),
@@ -345,5 +346,4 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 		unsigned long relid, subid, monid;
 		char *endp;
-		int err;
 
 		if (ent->d_name[0] == '.')
@@ -365,6 +365,5 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 			VMBUS_LOG(NOTICE, "invalid subchannel id %lu",
 				  subid);
-			closedir(chan_dir);
-			return err;
+			goto fail;
 		}
 
@@ -383,5 +382,5 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 			VMBUS_LOG(NOTICE, "invalid monitor id %lu",
 				  monid);
-			return err;
+			goto fail;
 		}
 
@@ -389,5 +388,5 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 		if (err) {
 			VMBUS_LOG(NOTICE, "subchannel setup failed");
-			return err;
+			goto fail;
 		}
 		break;
@@ -396,3 +395,6 @@ int vmbus_uio_get_subchan(struct vmbus_channel *primary,
 
 	return (ent == NULL) ? -ENOENT : 0;
+fail:
+	closedir(chan_dir);
+	return err;
 }
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:55.902566326 +0000
+++ 0064-bus-vmbus-fix-directory-handle-leak-on-error.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,14 +1,15 @@
-From 6521c9a2f7e00b0fcee940e0570ee12fcd9ca8dc Mon Sep 17 00:00:00 2001
+From 4e6f5483695e6f2b596b3c64d66170860351904e Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Tue, 6 Nov 2018 11:30:03 -0800
 Subject: [PATCH] bus/vmbus: fix directory handle leak on error
 
+[ upstream commit 6521c9a2f7e00b0fcee940e0570ee12fcd9ca8dc ]
+
 If sysfs directory was incorrectly formatted then the vmbus
 setup code would leak a directory handle in the error path.
 
 Coverity issue: 302848
 Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 ---