|
 |
dfb8478 |
From: Li Qiang <liq3ea@gmail.com>
|
|
|
dfb8478 |
Date: Thu, 29 Dec 2016 03:11:26 -0500
|
|
|
dfb8478 |
Subject: [PATCH] virtio-gpu-3d: fix memory leak in resource attach backing
|
|
|
dfb8478 |
MIME-Version: 1.0
|
|
|
dfb8478 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dfb8478 |
Content-Transfer-Encoding: 8bit
|
|
|
dfb8478 |
|
|
|
dfb8478 |
If the virgl_renderer_resource_attach_iov function fails the
|
|
|
dfb8478 |
'res_iovs' will be leaked. Add check of the return value to
|
|
|
dfb8478 |
free the 'res_iovs' when failing.
|
|
|
dfb8478 |
|
|
|
dfb8478 |
Signed-off-by: Li Qiang <liq3ea@gmail.com>
|
|
|
dfb8478 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
dfb8478 |
Message-id: 1482999086-59795-1-git-send-email-liq3ea@gmail.com
|
|
|
dfb8478 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
dfb8478 |
(cherry picked from commit 33243031dad02d161225ba99d782616da133f689)
|
|
|
dfb8478 |
---
|
|
|
dfb8478 |
hw/display/virtio-gpu-3d.c | 7 +++++--
|
|
|
dfb8478 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
dfb8478 |
|
|
|
dfb8478 |
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
|
|
|
dfb8478 |
index 420187e..4cffab5 100644
|
|
|
dfb8478 |
--- a/hw/display/virtio-gpu-3d.c
|
|
|
dfb8478 |
+++ b/hw/display/virtio-gpu-3d.c
|
|
|
dfb8478 |
@@ -289,8 +289,11 @@ static void virgl_resource_attach_backing(VirtIOGPU *g,
|
|
|
dfb8478 |
return;
|
|
|
dfb8478 |
}
|
|
|
dfb8478 |
|
|
|
dfb8478 |
- virgl_renderer_resource_attach_iov(att_rb.resource_id,
|
|
|
dfb8478 |
- res_iovs, att_rb.nr_entries);
|
|
|
dfb8478 |
+ ret = virgl_renderer_resource_attach_iov(att_rb.resource_id,
|
|
|
dfb8478 |
+ res_iovs, att_rb.nr_entries);
|
|
|
dfb8478 |
+
|
|
|
dfb8478 |
+ if (ret != 0)
|
|
|
dfb8478 |
+ virtio_gpu_cleanup_mapping_iov(res_iovs, att_rb.nr_entries);
|
|
|
dfb8478 |
}
|
|
|
dfb8478 |
|
|
|
dfb8478 |
static void virgl_resource_detach_backing(VirtIOGPU *g,
|