summary refs log tree commit diff stats
path: root/hw/display/virtio-gpu-3d.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2017-01-23 11:26:50 +0100
committerGerd Hoffmann <kraxel@redhat.com>2017-02-10 16:49:45 +0100
commit5e8e3c4c75c199aa1017db816fca02be2a9f8798 (patch)
tree9df5ec8dd572a5e96a2b7403ab8a1006c68ca9aa /hw/display/virtio-gpu-3d.c
parentdd248ed7e204ee8a1873914e02b8b526e8f1b80d (diff)
downloadfocaccia-qemu-5e8e3c4c75c199aa1017db816fca02be2a9f8798.tar.gz
focaccia-qemu-5e8e3c4c75c199aa1017db816fca02be2a9f8798.zip
virtio-gpu: fix resource leak in virgl_cmd_resource_unref
When the guest sends VIRTIO_GPU_CMD_RESOURCE_UNREF without detaching the
backing storage beforehand (VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING)
we'll leak memory.

This patch fixes it for 3d mode, simliar to the 2d mode fix in commit
"b8e2392 virtio-gpu: call cleanup mapping function in resource destroy".

Reported-by: 李强 <liqiang6-s@360.cn>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1485167210-4757-1-git-send-email-kraxel@redhat.com
Diffstat (limited to '')
-rw-r--r--hw/display/virtio-gpu-3d.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
index f96a0c2e59..ecb09d17a1 100644
--- a/hw/display/virtio-gpu-3d.c
+++ b/hw/display/virtio-gpu-3d.c
@@ -77,10 +77,18 @@ static void virgl_cmd_resource_unref(VirtIOGPU *g,
                                      struct virtio_gpu_ctrl_command *cmd)
 {
     struct virtio_gpu_resource_unref unref;
+    struct iovec *res_iovs = NULL;
+    int num_iovs = 0;
 
     VIRTIO_GPU_FILL_CMD(unref);
     trace_virtio_gpu_cmd_res_unref(unref.resource_id);
 
+    virgl_renderer_resource_detach_iov(unref.resource_id,
+                                       &res_iovs,
+                                       &num_iovs);
+    if (res_iovs != NULL && num_iovs != 0) {
+        virtio_gpu_cleanup_mapping_iov(res_iovs, num_iovs);
+    }
     virgl_renderer_resource_unref(unref.resource_id);
 }