From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Marcin Slusarz <marcin.slusarz@gmail.com>,
Dave Airlie <airlied@redhat.com>
Subject: [18/20] drm/ttm: fix ttm_bo_add_ttm(user) failure path
Date: Fri, 26 Aug 2011 15:03:41 -0700 [thread overview]
Message-ID: <20110826220420.656333466@clark.kroah.org> (raw)
In-Reply-To: <20110826220431.GA15382@kroah.com>
2.6.33-longterm review patch. If anyone has any objections, please let us know.
------------------
From: Marcin Slusarz <marcin.slusarz@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.slusarz@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@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
@@ -343,8 +343,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");
next prev parent reply other threads:[~2011-08-27 14:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-26 22:04 [00/20] 2.6.33.19-longterm review Greg KH
2011-08-26 22:03 ` [01/20] staging: rtl8192u: declare MODULE_FIRMWARE Greg KH
2011-08-26 22:03 ` [02/20] USB: xhci: fix OS want to own HC Greg KH
2011-08-26 22:03 ` [03/20] USB: assign instead of equal in usbtmc.c Greg KH
2011-08-26 22:03 ` [04/20] USB: usb-storage: unusual_devs entry for ARM V2M motherboard Greg KH
2011-08-26 22:03 ` [05/20] USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G Greg KH
2011-08-26 22:03 ` [06/20] atm: br2864: sent packets truncated in VC routed mode Greg KH
2011-08-26 22:03 ` [07/20] hwmon: (ibmaem) add missing kfree Greg KH
2011-08-26 22:03 ` [08/20] ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc Greg KH
2011-08-26 22:03 ` [09/20] mm: fix wrong vmap address calculations with odd NR_CPUS values Greg KH
2011-08-26 22:03 ` [10/20] perf tools: do not look at ./config for configuration Greg KH
2011-08-26 22:03 ` [11/20] fs/partitions/efi.c: corrupted GUID partition tables can cause kernel oops Greg KH
2011-08-26 22:03 ` [12/20] befs: Validate length of long symbolic links Greg KH
2011-08-26 22:03 ` [13/20] ALSA: snd_usb_caiaq: track submitted output urbs Greg KH
2011-08-26 22:03 ` [14/20] ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist Greg KH
2011-08-26 22:03 ` [15/20] futex: Fix regression with read only mappings Greg KH
2011-08-26 22:03 ` [16/20] x86-32, vdso: On system call restart after SYSENTER, use int $0x80 Greg KH
2011-08-26 22:03 ` [17/20] x86, UV: Remove UV delay in starting slave cpus Greg KH
2011-08-26 22:03 ` Greg KH [this message]
2011-08-26 22:03 ` [19/20] fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message Greg KH
2011-08-26 22:03 ` [20/20] igb: Fix lack of flush after register write and before delay Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110826220420.656333466@clark.kroah.org \
--to=gregkh@suse.de \
--cc=airlied@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=marcin.slusarz@gmail.com \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®