d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bus/vmbus: fix resource leak on error

Browse Source 
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
Fixes: 2a28a502c607 ("bus/vmbus: map ring in secondary process")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
This commit is contained in:
Stephen Hemminger 2019-04-17 11:45:06 -07:00 committed by Thomas Monjalon
parent 2aa0db405f
commit 26ed007067
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bus/vmbus/linux/vmbus_uio.c
View File

@ -283,10 +283,12 @@ vmbus_uio_map_secondary_subchan(const struct rte_vmbus_device *dev,
if (mapaddr == MAP_FAILED) if (mapaddr == MAP_FAILED)
VMBUS_LOG(ERR, VMBUS_LOG(ERR,
"mmap subchan %u in secondary failed", chan->relid); "mmap subchan %u in secondary failed", chan->relid);
else else {
VMBUS_LOG(ERR, VMBUS_LOG(ERR,
"mmap subchan %u in secondary address mismatch", "mmap subchan %u in secondary address mismatch",
chan->relid); chan->relid);
vmbus_unmap_resource(mapaddr, 2 * ring_size);
}
return -1; return -1;
} }

4
drivers/bus/vmbus/vmbus_common_uio.c
View File

@ -75,9 +75,11 @@ vmbus_uio_map_secondary(struct rte_vmbus_device *dev)
if (mapaddr == MAP_FAILED) if (mapaddr == MAP_FAILED)
VMBUS_LOG(ERR, VMBUS_LOG(ERR,
"mmap resource %d in secondary failed", i); "mmap resource %d in secondary failed", i);
else else {
VMBUS_LOG(ERR, VMBUS_LOG(ERR,
"mmap resource %d address mismatch", i); "mmap resource %d address mismatch", i);
vmbus_unmap_resource(mapaddr, uio_res->maps[i].size);
}
close(fd); close(fd);
return -1; return -1;