From: Johan Hovold <jhovold@gmail.com>
Date: Tue, 22 Mar 2011 10:12:10 +0000 (+0100)
Subject: USB: cdc-acm: fix potential null-pointer dereference
X-Git-Tag: v2.6.34.10~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c698c35db2a98a62e985640251610a03d6989dc3;p=thirdparty%2Fkernel%2Fstable.git

USB: cdc-acm: fix potential null-pointer dereference

commit 15e5bee33ffc11d0e5c6f819a65e7881c5c407be upstream.

Must check return value of tty_port_tty_get.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 073a9ef9fe605..af5ed89ca98cc 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -534,6 +534,8 @@ static void acm_softint(struct work_struct *work)
 	if (!ACM_READY(acm))
 		return;
 	tty = tty_port_tty_get(&acm->port);
+	if (!tty)
+		return;
 	tty_wakeup(tty);
 	tty_kref_put(tty);
 }