]>
Commit | Line | Data |
---|---|---|
4c390211 TL |
1 | From de1c3d4474562e9d9dc9952f9283f07d8d58ef98 Mon Sep 17 00:00:00 2001 |
2 | From: Gerd Hoffmann <kraxel@redhat.com> | |
3 | Date: Wed, 12 Jul 2017 12:35:52 +0200 | |
4 | Subject: [PATCH 1/3] drm/virtio: don't leak bo on drm_gem_object_init failure | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | Reported-by: 李强 <liqiang6-s@360.cn> | |
10 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> | |
11 | Link: http://patchwork.freedesktop.org/patch/msgid/20170406155941.458-1-kraxel@redhat.com | |
12 | ||
13 | CVE-2017-10810 | |
14 | ||
15 | (cherry picked from commit 385aee965b4e4c36551c362a334378d2985b722a) | |
16 | Signed-off-by: Stefan Bader <stefan.bader@canonical.com> | |
17 | Acked-by: Seth Forshee <seth.forshee@canonical.com> | |
18 | Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
19 | Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> | |
20 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
21 | --- | |
22 | drivers/gpu/drm/virtio/virtgpu_object.c | 4 +++- | |
23 | 1 file changed, 3 insertions(+), 1 deletion(-) | |
24 | ||
25 | diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c | |
26 | index 1483daebe057..6f66b7347cd0 100644 | |
27 | --- a/drivers/gpu/drm/virtio/virtgpu_object.c | |
28 | +++ b/drivers/gpu/drm/virtio/virtgpu_object.c | |
29 | @@ -81,8 +81,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, | |
30 | return -ENOMEM; | |
31 | size = roundup(size, PAGE_SIZE); | |
32 | ret = drm_gem_object_init(vgdev->ddev, &bo->gem_base, size); | |
33 | - if (ret != 0) | |
34 | + if (ret != 0) { | |
35 | + kfree(bo); | |
36 | return ret; | |
37 | + } | |
38 | bo->dumb = false; | |
39 | virtio_gpu_init_ttm_placement(bo, pinned); | |
40 | ||
41 | -- | |
42 | 2.11.0 | |
43 |