[dpdk-stable] patch 'bus/vmbus: fix check for mmap 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/01/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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From e25ef3d4192350b9ba7408b71c2f9f7f76ddd49d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin at microsoft.com>
Date: Thu, 7 Feb 2019 19:44:03 -0800
Subject: [PATCH] bus/vmbus: fix check for mmap failure

[ upstream commit 3f9277031a2e0fc6e61503e55045bf41fc2bf171 ]

The code was testing the result of mmap incorrectly.
I.e the test that a local pointer is not MAP_FAILED would
always succeed and therefore hid any potential problems.

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

Signed-off-by: Stephen Hemminger <sthemmin at microsoft.com>
---
 drivers/bus/vmbus/linux/vmbus_uio.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index 38df4d724..7a3f3fda9 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -203,4 +203,5 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,
 	size_t file_size;
 	struct stat sb;
+	void *mapaddr;
 	int fd;
 
@@ -233,12 +234,14 @@ static int vmbus_uio_map_subchan(const struct rte_vmbus_device *dev,
 	}
 
-	*ring_size = file_size / 2;
-	*ring_buf = vmbus_map_resource(vmbus_map_addr, fd,
-				       0, sb.st_size, 0);
+	mapaddr = vmbus_map_resource(vmbus_map_addr, fd,
+				     0, file_size, 0);
 	close(fd);
 
-	if (ring_buf == MAP_FAILED)
+	if (mapaddr == MAP_FAILED)
 		return -EIO;
 
+	*ring_size = file_size / 2;
+	*ring_buf = mapaddr;
+
 	vmbus_map_addr = RTE_PTR_ADD(ring_buf, file_size);
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:46.991235697 +0100
+++ 0005-bus-vmbus-fix-check-for-mmap-failure.patch	2019-04-25 16:37:46.684296345 +0100
@@ -1 +1 @@
-From 3f9277031a2e0fc6e61503e55045bf41fc2bf171 Mon Sep 17 00:00:00 2001
+From e25ef3d4192350b9ba7408b71c2f9f7f76ddd49d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f9277031a2e0fc6e61503e55045bf41fc2bf171 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 09f7efdca..8c6bc52fd 100644
+index 38df4d724..7a3f3fda9 100644