rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CVE-2017-10810 fix virtio-gpu mem leak (rhbz 1468023 1468024)

This commit is contained in:
Justin M. Forbes 2017-07-06 09:10:40 -05:00
parent 1fba72eb71
commit 3c3bd1abc4
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch Normal file
View File

@ -0,0 +1,34 @@
From 385aee965b4e4c36551c362a334378d2985b722a Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 6 Apr 2017 17:59:40 +0200
Subject: [PATCH] drm/virtio: don't leak bo on drm_gem_object_init failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reported-by: 李强 <liqiang6-s@360.cn>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170406155941.458-1-kraxel@redhat.com
---
drivers/gpu/drm/virtio/virtgpu_object.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index 1483dae..6f66b73 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -81,8 +81,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
return -ENOMEM;
size = roundup(size, PAGE_SIZE);
ret = drm_gem_object_init(vgdev->ddev, &bo->gem_base, size);
- if (ret != 0)
+ if (ret != 0) {
+ kfree(bo);
return ret;
+ }
bo->dumb = false;
virtio_gpu_init_ttm_placement(bo, pinned);
--
2.9.4

6
kernel.spec
View File

@ -631,6 +631,9 @@ Patch681: 0002-platform-x86-thinkpad_acpi-add-mapping-for-new-hotke.patch
# rhbz 1459326
Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch
#CVE-2017-10810 rhbz 1468023 1468024
Patch684: 0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch
# END OF PATCH DEFINITIONS
%endif
@ -2195,6 +2198,9 @@ fi
#
#
%changelog
* Thu Jul 06 2017 Justin M. Forbes <jforbes@fedoraproject.org>
- CVE-2017-10810 fix virtio-gpu mem leak (rhbz 1468023 1468024)
* Wed Jul 05 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.9-200
- Linux v4.11.9