[linux] 03/06: drm/virtio: don't leak bo on drm_gem_object_init failure (CVE-2017-10810)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch stretch-security
in repository linux.

commit 882fc3b9df353b7af568db9d5f62b259cb90c612
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Jul 26 23:02:27 2017 +0200

    drm/virtio: don't leak bo on drm_gem_object_init failure (CVE-2017-10810)
---
 debian/changelog                                   |  1 +
 ...don-t-leak-bo-on-drm_gem_object_init-fail.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4bc6cbb..9a406cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.9.30-2+deb9u3) UNRELEASED; urgency=medium
     (CVE-2017-7541)
   * ipv6: avoid overflow of offset in ip6_find_1stfragopt (CVE-2017-7542)
   * [x86] drm/vmwgfx: Make sure backup_handle is always valid (CVE-2017-9605)
+  * drm/virtio: don't leak bo on drm_gem_object_init failure (CVE-2017-10810)
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 26 Jul 2017 22:08:32 +0200
 
diff --git a/debian/patches/bugfix/all/drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch b/debian/patches/bugfix/all/drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch
new file mode 100644
index 0000000..526bdbb
--- /dev/null
+++ b/debian/patches/bugfix/all/drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch
@@ -0,0 +1,35 @@
+From: Gerd Hoffmann <kraxel at redhat.com>
+Date: Thu, 6 Apr 2017 17:59:40 +0200
+Subject: 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
+Origin: https://git.kernel.org/linus/385aee965b4e4c36551c362a334378d2985b722a
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-10810
+
+Reported-by: 李强 <liqiang6-s at 360.cn>
+Signed-off-by: Gerd Hoffmann <kraxel at 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 1483daebe057..6f66b7347cd0 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.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index ce438b5..aec8e49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -127,6 +127,7 @@ bugfix/all/rxrpc-Fix-several-cases-where-a-padded-len-isn-t-che.patch
 bugfix/all/brcmfmac-fix-possible-buffer-overflow-in-brcmf_cfg80.patch
 bugfix/all/ipv6-avoid-overflow-of-offset-in-ip6_find_1stfragopt.patch
 bugfix/x86/drm-vmwgfx-Make-sure-backup_handle-is-always-valid.patch
+bugfix/all/drm-virtio-don-t-leak-bo-on-drm_gem_object_init-fail.patch
 
 # Fix exported symbol versions
 bugfix/ia64/revert-ia64-move-exports-to-definitions.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git