diff options
| author | Peter Maydell | 2017-01-05 11:22:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-05 11:22:47 +0100 |
| commit | 12597061b3fd71f8f97c18acf508241f290d55d5 (patch) | |
| tree | a257c3f419015f36685839bdf0f498474912a4c6 /hw/display/virtio-gpu-3d.c | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' ... (diff) | |
| parent | virtio-gpu: fix memory leak in resource attach backing (diff) | |
| download | qemu-12597061b3fd71f8f97c18acf508241f290d55d5.tar.gz qemu-12597061b3fd71f8f97c18acf508241f290d55d5.tar.xz qemu-12597061b3fd71f8f97c18acf508241f290d55d5.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20170103-1' into staging
virtio-gpu: misc bugfixes.
# gpg: Signature made Tue 03 Jan 2017 14:48:04 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-vga-20170103-1:
virtio-gpu: fix memory leak in resource attach backing
virtio-gpu-3d: fix memory leak in resource attach backing
virtio-gpu: call cleanup mapping function in resource destroy
virtio-gpu: track and limit host memory allocations
display: virtio-gpu-3d: check virgl capabilities max_size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-gpu-3d.c')
| -rw-r--r-- | hw/display/virtio-gpu-3d.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 23f39de94d..b13ced38fa 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -291,8 +291,11 @@ static void virgl_resource_attach_backing(VirtIOGPU *g, return; } - virgl_renderer_resource_attach_iov(att_rb.resource_id, - res_iovs, att_rb.nr_entries); + ret = virgl_renderer_resource_attach_iov(att_rb.resource_id, + res_iovs, att_rb.nr_entries); + + if (ret != 0) + virtio_gpu_cleanup_mapping_iov(res_iovs, att_rb.nr_entries); } static void virgl_resource_detach_backing(VirtIOGPU *g, @@ -371,8 +374,12 @@ static void virgl_cmd_get_capset(VirtIOGPU *g, virgl_renderer_get_cap_set(gc.capset_id, &max_ver, &max_size); - resp = g_malloc(sizeof(*resp) + max_size); + if (!max_size) { + cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; + return; + } + resp = g_malloc(sizeof(*resp) + max_size); resp->hdr.type = VIRTIO_GPU_RESP_OK_CAPSET; virgl_renderer_fill_caps(gc.capset_id, gc.capset_version, |