ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libvhost-user: Fix resource leak 

Free the mmaped memory when we need to mmap new memory
space on vu_set_mem_table_exec() and vu_set_log_base_exec() to
avoid memory leak.

Also close the corresponding fd after mmap() on
vu_set_log_base_exec() to avoid fd leak.

Signed-off-by: Yongji Xie <xieyongji@baidu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Yongji Xie 2018-01-18 23:41:56 +08:00 committed by Michael S. Tsirkin
parent b86107ab43
commit bb102d1da1
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/libvhost-user/libvhost-user.c
View File

@ -407,6 +407,15 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)
{ {
int i; int i;
VhostUserMemory *memory = &vmsg->payload.memory; VhostUserMemory *memory = &vmsg->payload.memory;
for (i = 0; i < dev->nregions; i++) {
VuDevRegion *r = &dev->regions[i];
void *m = (void *) (uintptr_t) r->mmap_addr;
if (m) {
munmap(m, r->size + r->mmap_offset);
}
}
dev->nregions = memory->nregions; dev->nregions = memory->nregions;
DPRINT("Nregions: %d\n", memory->nregions); DPRINT("Nregions: %d\n", memory->nregions);
@ -472,9 +481,14 @@ vu_set_log_base_exec(VuDev *dev, VhostUserMsg *vmsg)
rc = mmap(0, log_mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, rc = mmap(0, log_mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
log_mmap_offset); log_mmap_offset);
close(fd);
if (rc == MAP_FAILED) { if (rc == MAP_FAILED) {
perror("log mmap error"); perror("log mmap error");
} }
if (dev->log_table) {
munmap(dev->log_table, dev->log_size);
}
dev->log_table = rc; dev->log_table = rc;
dev->log_size = log_mmap_size; dev->log_size = log_mmap_size;