This is a note to let you know that I've just added the patch titled
drm/ttm: fix ttm_bo_add_ttm(user) failure path
to the 2.6.32-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
The filename of the patch is:
drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.32 longterm
tree,
please let <sta...@kernel.org> know about it.
>From 7c4c3960dff109bc5db4c35da481c212dadb5eb5 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slus...@gmail.com>
Date: Mon, 22 Aug 2011 21:17:57 +0000
Subject: drm/ttm: fix ttm_bo_add_ttm(user) failure path
From: Marcin Slusarz <marcin.slus...@gmail.com>
commit 7c4c3960dff109bc5db4c35da481c212dadb5eb5 upstream.
ttm_tt_destroy kfrees passed object, so we need to nullify
a reference to it.
Signed-off-by: Marcin Slusarz <marcin.slus...@gmail.com>
Reviewed-by: Thomas Hellstrom <thellst...@vmware.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
drivers/gpu/drm/ttm/ttm_bo.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -281,8 +281,10 @@ static int ttm_bo_add_ttm(struct ttm_buf
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");
Patches currently in longterm-queue-2.6.32 which might be from
marcin.slus...@gmail.com are
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/drm-ttm-fix-ttm_bo_add_ttm-user-failure-path.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
