diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-07-06 09:10:34 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-07-06 09:10:34 -0500 |
| commit | d04a86fb89dc3ac038671b6a6dd67775d4eeec07 (patch) | |
| tree | d72c48cf3b5f1af97595808ab18bdd85d832f1d5 | |
| parent | 64f33c431734941a603fc1e5ef4bc09e8a1a97b3 (diff) | |
| download | kernel-d04a86fb89dc3ac038671b6a6dd67775d4eeec07.tar.gz kernel-d04a86fb89dc3ac038671b6a6dd67775d4eeec07.tar.xz kernel-d04a86fb89dc3ac038671b6a6dd67775d4eeec07.zip | |
CVE-2017-10810 fix virtio-gpu mem leak (rhbz 1468023 1468024)
| -rw-r--r-- | 0001-drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch | 34 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 40 insertions, 0 deletions
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 000000000..a2e0fec2c --- /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 <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 + diff --git a/kernel.spec b/kernel.spec index 15e809b70..7b9c07e46 100644 --- a/kernel.spec +++ b/kernel.spec @@ -666,6 +666,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 @@ -2231,6 +2234,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-300 - Linux v4.11.9 |