eaa6ce4fe2
CVE-2017-5525: audio: memory leakage in ac97 (bz #1414110) CVE-2017-5526: audio: memory leakage in es1370 (bz #1414210) CVE-2016-10155 watchdog: memory leakage in i6300esb (bz #1415200) CVE-2017-5552: virtio-gpu-3d: memory leakage (bz #1415283) CVE-2017-5578: virtio-gpu: memory leakage (bz #1415797) CVE-2017-5667: sd: sdhci OOB access during multi block transfer (bz #1417560) CVE-2017-5856: scsi: megasas: memory leakage (bz #1418344) CVE-2017-5857: virtio-gpu-3d: host memory leakage in virgl_cmd_resource_unref (bz #1418383) CVE-2017-5898: usb: integer overflow in emulated_apdu_from_guest (bz #1419700) CVE-2017-5987: sd: infinite loop issue in multi block transfers (bz #1422001) CVE-2017-6058: vmxnet3: OOB access when doing vlan stripping (bz #1423359) CVE-2017-6505: usb: an infinite loop issue in ohci_service_ed_list (bz #1429434) CVE-2017-2615: cirrus: oob access while doing bitblt copy backward (bz #1418206) CVE-2017-2620: cirrus: potential arbitrary code execution (bz #1425419) Fix spice GL with new mesa/libglvnd (bz #1431905)
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Mon, 23 Jan 2017 11:26:50 +0100
|
|
Subject: [PATCH] virtio-gpu: fix resource leak in virgl_cmd_resource_unref
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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
|
|
(cherry picked from commit 5e8e3c4c75c199aa1017db816fca02be2a9f8798)
|
|
---
|
|
hw/display/virtio-gpu-3d.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
|
|
index f96a0c2..ecb09d1 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);
|
|
}
|
|
|