[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] hw/display/virtio-gpu: Fix memory leak (CID 1453811)
From: |
Gerd Hoffmann |
Subject: |
[PULL 1/6] hw/display/virtio-gpu: Fix memory leak (CID 1453811) |
Date: |
Fri, 23 Jul 2021 07:54:43 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
To avoid leaking memory on the error path, reorder the
code as:
- check the parameters first
- check resource already existing
- finally allocate memory
Reported-by: Coverity (CID 1453811: RESOURCE_LEAK)
Fixes: e0933d91b1c ("virtio-gpu: Add virtio_gpu_resource_create_blob")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210531101928.1662732-1-philmd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/virtio-gpu.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 6b7f643951fe..990e71fd4062 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -340,37 +340,31 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU *g,
return;
}
- res = virtio_gpu_find_resource(g, cblob.resource_id);
- if (res) {
- qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already exists %d\n",
- __func__, cblob.resource_id);
- cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
- return;
- }
-
- res = g_new0(struct virtio_gpu_simple_resource, 1);
- res->resource_id = cblob.resource_id;
- res->blob_size = cblob.size;
-
if (cblob.blob_mem != VIRTIO_GPU_BLOB_MEM_GUEST &&
cblob.blob_flags != VIRTIO_GPU_BLOB_FLAG_USE_SHAREABLE) {
qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid memory type\n",
__func__);
cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER;
- g_free(res);
return;
}
- if (res->iov) {
- cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
+ if (virtio_gpu_find_resource(g, cblob.resource_id)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: resource already exists %d\n",
+ __func__, cblob.resource_id);
+ cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
return;
}
+ res = g_new0(struct virtio_gpu_simple_resource, 1);
+ res->resource_id = cblob.resource_id;
+ res->blob_size = cblob.size;
+
ret = virtio_gpu_create_mapping_iov(g, cblob.nr_entries, sizeof(cblob),
cmd, &res->addrs, &res->iov,
&res->iov_cnt);
- if (ret != 0) {
+ if (ret != 0 || res->iov) {
cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC;
+ g_free(res);
return;
}
--
2.31.1
- [PULL 0/6] Vga 20210723 patches, Gerd Hoffmann, 2021/07/23
- [PULL 1/6] hw/display/virtio-gpu: Fix memory leak (CID 1453811),
Gerd Hoffmann <=
- [PULL 2/6] qxl: remove assert in qxl_pre_save., Gerd Hoffmann, 2021/07/23
- [PULL 4/6] hw/display: fail early when multiple virgl devices are requested, Gerd Hoffmann, 2021/07/23
- [PULL 3/6] Revert "qxl: add migration blocker to avoid pre-save assert", Gerd Hoffmann, 2021/07/23
- [PULL 5/6] vl: add virtio-vga-gl to the default_list, Gerd Hoffmann, 2021/07/23
- [PULL 6/6] hw/display: fix virgl reset regression, Gerd Hoffmann, 2021/07/23
- Re: [PULL 0/6] Vga 20210723 patches, Peter Maydell, 2021/07/23