Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 1 | CVE: CVE-2021-3544 |
| 2 | Upstream-Status: Backport |
| 3 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 4 | |
| 5 | From f6091d86ba9ea05f4e111b9b42ee0005c37a6779 Mon Sep 17 00:00:00 2001 |
| 6 | From: Li Qiang <liq3ea@163.com> |
| 7 | Date: Sat, 15 May 2021 20:04:00 -0700 |
| 8 | Subject: [PATCH 5/7] vhost-user-gpu: fix memory leak in |
| 9 | 'virgl_cmd_resource_unref' (CVE-2021-3544) |
| 10 | MIME-Version: 1.0 |
| 11 | Content-Type: text/plain; charset=UTF-8 |
| 12 | Content-Transfer-Encoding: 8bit |
| 13 | |
| 14 | The 'res->iov' will be leaked if the guest trigger following sequences: |
| 15 | |
| 16 | virgl_cmd_create_resource_2d |
| 17 | virgl_resource_attach_backing |
| 18 | virgl_cmd_resource_unref |
| 19 | |
| 20 | This patch fixes this. |
| 21 | |
| 22 | Fixes: CVE-2021-3544 |
| 23 | Reported-by: Li Qiang <liq3ea@163.com> |
| 24 | virtio-gpu fix: 5e8e3c4c75 ("virtio-gpu: fix resource leak |
| 25 | in virgl_cmd_resource_unref" |
| 26 | |
| 27 | Signed-off-by: Li Qiang <liq3ea@163.com> |
| 28 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> |
| 29 | Message-Id: <20210516030403.107723-6-liq3ea@163.com> |
| 30 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| 31 | --- |
| 32 | contrib/vhost-user-gpu/virgl.c | 7 +++++++ |
| 33 | 1 file changed, 7 insertions(+) |
| 34 | |
| 35 | diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c |
| 36 | index 6a332d601f..c669d73a1d 100644 |
| 37 | --- a/contrib/vhost-user-gpu/virgl.c |
| 38 | +++ b/contrib/vhost-user-gpu/virgl.c |
| 39 | @@ -108,9 +108,16 @@ virgl_cmd_resource_unref(VuGpu *g, |
| 40 | struct virtio_gpu_ctrl_command *cmd) |
| 41 | { |
| 42 | struct virtio_gpu_resource_unref unref; |
| 43 | + struct iovec *res_iovs = NULL; |
| 44 | + int num_iovs = 0; |
| 45 | |
| 46 | VUGPU_FILL_CMD(unref); |
| 47 | |
| 48 | + virgl_renderer_resource_detach_iov(unref.resource_id, |
| 49 | + &res_iovs, |
| 50 | + &num_iovs); |
| 51 | + g_free(res_iovs); |
| 52 | + |
| 53 | virgl_renderer_resource_unref(unref.resource_id); |
| 54 | } |
| 55 | |
| 56 | -- |
| 57 | 2.25.1 |
| 58 | |