[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] virtio-gpu: Fix memory leak in virtio_gpu_load()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/5] virtio-gpu: Fix memory leak in virtio_gpu_load() |
Date: |
Wed, 11 Jan 2017 11:28:36 +0100 |
From: Peter Maydell <address@hidden>
Coverity points out that if we fail in the "creating resources"
loop in virtio_gpu_load() we will leak various resources (CID 1356431).
Failing a VM load is going to leave the simulation in a complete mess,
but we can tidy up to the point that a full system reset should
get us back to sanity.
Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/virtio-gpu.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index c3cf47e..cef736c 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1052,12 +1052,14 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,
size_t size)
/* allocate */
pformat = get_pixman_format(res->format);
if (!pformat) {
+ g_free(res);
return -EINVAL;
}
res->image = pixman_image_create_bits(pformat,
res->width, res->height,
NULL, 0);
if (!res->image) {
+ g_free(res);
return -EINVAL;
}
@@ -1080,6 +1082,16 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,
size_t size)
res->iov[i].iov_base =
cpu_physical_memory_map(res->addrs[i], &len, 1);
if (!res->iov[i].iov_base || len != res->iov[i].iov_len) {
+ /* Clean up the half-a-mapping we just created... */
+ if (res->iov[i].iov_base) {
+ cpu_physical_memory_unmap(res->iov[i].iov_base,
+ len, 0, 0);
+ }
+ /* ...and the mappings for previous loop iterations */
+ res->iov_cnt = i;
+ virtio_gpu_cleanup_mapping(res);
+ pixman_image_unref(res->image);
+ g_free(res);
return -EINVAL;
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] vga patch queue, Gerd Hoffmann, 2017/01/11
- [Qemu-devel] [PULL 4/5] virtio-gpu: Fix memory leak in virtio_gpu_load(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/5] virtio-gpu: tag as not hotpluggable, Gerd Hoffmann, 2017/01/11
- [Qemu-devel] [PULL 3/5] virtio-gpu: Recalculate VirtIOGPU::hostmem on VM load, Gerd Hoffmann, 2017/01/11
- [Qemu-devel] [PULL 1/5] virtio-gpu: fix information leak in capset get dispatch, Gerd Hoffmann, 2017/01/11
- [Qemu-devel] [PULL 2/5] display: cirrus: ignore source pitch value as needed in blit_is_unsafe, Gerd Hoffmann, 2017/01/11
- Re: [Qemu-devel] [PULL 0/5] vga patch queue, Peter Maydell, 2017/01/12