51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
|
|
From 6348348ee6a76c28159c64d6392fb6ba5a0b4374 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Li Qiang <liq3ea@163.com>
|
||
|
|
Date: Tue, 15 Jun 2021 10:09:13 +0800
|
||
|
|
Subject: [PATCH] vhost-user-gpu: fix memory leak in
|
||
|
|
'virgl_resource_attach_backing' (CVE-2021-3544)
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Fix CVE-2021-3544
|
||
|
|
|
||
|
|
If 'virgl_renderer_resource_attach_iov' failed, the 'res_iovs' will
|
||
|
|
be leaked.
|
||
|
|
|
||
|
|
Fixes: CVE-2021-3544
|
||
|
|
Reported-by: default avatarLi Qiang <liq3ea@163.com>
|
||
|
|
virtio-gpu fix: 33243031
|
||
|
|
|
||
|
|
("virtio-gpu-3d: fix memory leak
|
||
|
|
in resource attach backing")
|
||
|
|
Signed-off-by: default avatarLi Qiang <liq3ea@163.com>
|
||
|
|
Reviewed-by: Marc-André Lureau's avatarMarc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Message-Id: <20210516030403.107723-7-liq3ea@163.com>
|
||
|
|
Signed-off-by: Gerd Hoffmann's avatarGerd Hoffmann <kraxel@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
|
||
|
|
---
|
||
|
|
contrib/vhost-user-gpu/virgl.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c
|
||
|
|
index 4b8b536edf..79556df094 100644
|
||
|
|
--- a/contrib/vhost-user-gpu/virgl.c
|
||
|
|
+++ b/contrib/vhost-user-gpu/virgl.c
|
||
|
|
@@ -282,8 +282,11 @@ virgl_resource_attach_backing(VuGpu *g,
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
- virgl_renderer_resource_attach_iov(att_rb.resource_id,
|
||
|
|
+ ret = virgl_renderer_resource_attach_iov(att_rb.resource_id,
|
||
|
|
res_iovs, att_rb.nr_entries);
|
||
|
|
+ if (ret != 0) {
|
||
|
|
+ g_free(res_iovs);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|