summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-03-22 11:12:10 +0100
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-06-26 12:47:12 -0400
commitc698c35db2a98a62e985640251610a03d6989dc3 (patch)
tree08135ffa74109a89f72718b2e110e907c400b146
parent6966865f64cfcab87a1fd096b4a30c22a0f09900 (diff)
downloadlinux-rt-c698c35db2a98a62e985640251610a03d6989dc3.tar.gz
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>
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 073a9ef9fe60..af5ed89ca98c 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);
}