From d88be6a0e23488ed0eb237bd51b2a435545adae2 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: Jul 06 2017 14:10:40 +0000 Subject: CVE-2017-10810 fix virtio-gpu mem leak (rhbz 1468023 1468024) --- diff --git a/0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch b/0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch new file mode 100644 index 0000000..a2e0fec --- /dev/null +++ b/0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch @@ -0,0 +1,34 @@ +From 385aee965b4e4c36551c362a334378d2985b722a Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +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: 李强 +Signed-off-by: Gerd Hoffmann +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 + diff --git a/kernel.spec b/kernel.spec index b88df63..a4b4932 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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 +- CVE-2017-10810 fix virtio-gpu mem leak (rhbz 1468023 1468024) + * Wed Jul 05 2017 Laura Abbott - 4.11.9-100 - Linux v4.11.9