[kernel] r18077 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 11 22:49:25 2011
New Revision: 18077

Log:
drm/ttm: fix ttm_bo_add_ttm(user) failure path

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Sep 11 22:41:28 2011	(r18076)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Sep 11 22:49:25 2011	(r18077)
@@ -98,11 +98,11 @@
     - ALSA: snd_usb_caiaq: track submitted output urbs
     - futex: Fix regression with read only mappings
     - x86-32, vdso: On system call restart after SYSENTER, use int $0x80
-    - drm/ttm: fix ttm_bo_add_ttm(user) failure path
     - fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.46
     and the bug report which this closes: #641232.
+  * drm/ttm: fix ttm_bo_add_ttm(user) failure path
 
  -- maximilian attems <maks at debian.org>  Sat, 25 Jun 2011 10:22:27 +0200
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch	Sun Sep 11 22:49:25 2011	(r18077)
@@ -0,0 +1,36 @@
+From: Marcin Slusarz <marcin.slusarz at gmail.com>
+Date: Mon, 22 Aug 2011 21:17:57 +0000
+Subject: [PATCH] drm/ttm: fix ttm_bo_add_ttm(user) failure path
+
+commit 7c4c3960dff109bc5db4c35da481c212dadb5eb5 upstream.
+
+ttm_tt_destroy kfrees passed object, so we need to nullify
+a reference to it.
+
+Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
+Reviewed-by: Thomas Hellstrom <thellstrom at vmware.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/gpu/drm/ttm/ttm_bo.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
+index acbfa27..94706ef 100644
+--- a/drivers/gpu/drm/ttm/ttm_bo.c
++++ b/drivers/gpu/drm/ttm/ttm_bo.c
+@@ -343,8 +343,10 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)
+ 
+ 		ret = ttm_tt_set_user(bo->ttm, current,
+ 				      bo->buffer_start, bo->num_pages);
+-		if (unlikely(ret != 0))
++		if (unlikely(ret != 0)) {
+ 			ttm_tt_destroy(bo->ttm);
++			bo->ttm = NULL;
++		}
+ 		break;
+ 	default:
+ 		printk(KERN_ERR TTM_PFX "Illegal buffer object type\n");
+-- 
+1.7.5.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sun Sep 11 22:41:28 2011	(r18076)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sun Sep 11 22:49:25 2011	(r18077)
@@ -691,3 +691,5 @@
 - bugfix/all/befs-validate-length-of-long-symbolic-links.patch
 - bugfix/all/efi-corrupted-GUID-partition-tables-can-cause-kernel-oops.patch
 + bugfix/all/stable/2.6.32.46.patch
+
++ bugfix/all/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch