bus/vmbus: fix resource leak on error

Message ID 20190417184506.18850-1-stephen@networkplumber.org
State Accepted, archived
Headers show
Series
  • bus/vmbus: fix resource leak on error
Related show

Checks

Context Check Description
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch warning coding style issues

Commit Message

Stephen Hemminger April 17, 2019, 6:45 p.m.
If secondary process attempt to mmap the resource resulted in
the wrong address, then it would leave behind the bad mmap.

Coverity issue: 337675, 337664
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/bus/vmbus/linux/vmbus_uio.c  | 4 +++-
 drivers/bus/vmbus/vmbus_common_uio.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Comments

Thomas Monjalon April 22, 2019, 12:43 p.m. | #1
17/04/2019 20:45, Stephen Hemminger:
> If secondary process attempt to mmap the resource resulted in
> the wrong address, then it would leave behind the bad mmap.
> 
> Coverity issue: 337675, 337664
> Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>

Fixes: 2a28a502c607 ("bus/vmbus: map ring in secondary process")

Applied, thanks

Patch

diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index fb60ee126d9b..be6b677f99d0 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -283,10 +283,12 @@  vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,
 	if (mapaddr == MAP_FAILED)
 		VMBUS_LOG(ERR,
 			  "mmap subchan %u in secondary failed", chan->relid);
-	else
+	else {
 		VMBUS_LOG(ERR,
 			  "mmap subchan %u in secondary address mismatch",
 			  chan->relid);
+		vmbus_unmap_resource(mapaddr, 2 * ring_size);
+	}
 	return -1;
 }
 
diff --git a/drivers/bus/vmbus/vmbus_common_uio.c b/drivers/bus/vmbus/vmbus_common_uio.c
index 1aa5cb2e4b92..8e476f2eaf8b 100644
--- a/drivers/bus/vmbus/vmbus_common_uio.c
+++ b/drivers/bus/vmbus/vmbus_common_uio.c
@@ -75,9 +75,11 @@  vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
 		if (mapaddr == MAP_FAILED)
 			VMBUS_LOG(ERR,
 				  "mmap resource %d in secondary failed", i);
-		else
+		else {
 			VMBUS_LOG(ERR,
 				  "mmap resource %d address mismatch", i);
+			vmbus_unmap_resource(mapaddr, uio_res->maps[i].size);
+		}
 
 		close(fd);
 		return -1;