diff options
| author | Johan Hovold <jhovold@gmail.com> | 2011-03-22 11:12:11 +0100 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-06-26 12:47:12 -0400 |
| commit | 6966865f64cfcab87a1fd096b4a30c22a0f09900 (patch) | |
| tree | 1e89a38dd5f310c32e2044ed6586ea4895fd2e85 /drivers | |
| parent | a7306340447ff615f715b341517f140be5992942 (diff) | |
| download | linux-stable-6966865f64cfcab87a1fd096b4a30c22a0f09900.tar.gz linux-stable-6966865f64cfcab87a1fd096b4a30c22a0f09900.tar.bz2 linux-stable-6966865f64cfcab87a1fd096b4a30c22a0f09900.zip | |
USB: cdc-acm: fix potential null-pointer dereference on disconnect
commit 7e7797e7f6f7bfab73fca02c65e40eaa5bb9000c upstream.
Fix potential null-pointer exception on disconnect introduced by commit
11ea859d64b69a747d6b060b9ed1520eab1161fe (USB: additional power savings
for cdc-acm devices that support remote wakeup).
Only access acm->dev after making sure it is non-null in control urb
completion handler.
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index a45e6c404ffc..073a9ef9fe60 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -297,6 +297,8 @@ static void acm_ctrl_irq(struct urb *urb) if (!ACM_READY(acm)) goto exit; + usb_mark_last_busy(acm->dev); + data = (unsigned char *)(dr + 1); switch (dr->bNotificationType) { case USB_CDC_NOTIFY_NETWORK_CONNECTION: @@ -336,7 +338,6 @@ static void acm_ctrl_irq(struct urb *urb) break; } exit: - usb_mark_last_busy(acm->dev); retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with " |