haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vhost: fix resource leak in error handling

Browse source 
vhost_verify_ring_mappings leaks mappings on error.
Fix this up.

Cc: qemu-stable@nongnu.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2014-06-18 18:55:22 +03:00
parent 7145872ed3
commit 8617343faa
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hw/virtio/vhost.c
View file

@ -305,7 +305,9 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
uint64_t size) uint64_t size)
{ {
int i; int i;
for (i = 0; i < dev->nvqs; ++i) { int r = 0;
for (i = 0; !r && i < dev->nvqs; ++i) {
struct vhost_virtqueue *vq = dev->vqs + i; struct vhost_virtqueue *vq = dev->vqs + i;
hwaddr l; hwaddr l;
void *p; void *p;
@ -317,15 +319,15 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
p = cpu_physical_memory_map(vq->ring_phys, &l, 1); p = cpu_physical_memory_map(vq->ring_phys, &l, 1);
if (!p || l != vq->ring_size) { if (!p || l != vq->ring_size) {
fprintf(stderr, "Unable to map ring buffer for ring %d\n", i); fprintf(stderr, "Unable to map ring buffer for ring %d\n", i);
return -ENOMEM; r = -ENOMEM;
} }
if (p != vq->ring) { if (p != vq->ring) {
fprintf(stderr, "Ring buffer relocated for ring %d\n", i); fprintf(stderr, "Ring buffer relocated for ring %d\n", i);
return -EBUSY; r = -EBUSY;
} }
cpu_physical_memory_unmap(p, l, 0, 0); cpu_physical_memory_unmap(p, l, 0, 0);
} }
return 0; return r;
} }
static struct vhost_memory_region *vhost_dev_find_reg(struct vhost_dev *dev, static struct vhost_memory_region *vhost_dev_find_reg(struct vhost_dev *dev,