AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
Fix potential null-pointer exception on disconnect introduced by commit
11ea859d64 (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.

Cc: stable <stable@kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold 2011-03-22 11:12:11 +01:00 committed by Greg Kroah-Hartman
parent 15e5bee33f
commit 7e7797e7f6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/class/cdc-acm.c
View File

@ -297,6 +297,8 @@ static void acm_ctrl_irq(struct urb *urb)
if (!ACM_READY(acm)) if (!ACM_READY(acm))
goto exit; goto exit;
usb_mark_last_busy(acm->dev);
data = (unsigned char *)(dr + 1); data = (unsigned char *)(dr + 1);
switch (dr->bNotificationType) { switch (dr->bNotificationType) {
case USB_CDC_NOTIFY_NETWORK_CONNECTION: case USB_CDC_NOTIFY_NETWORK_CONNECTION:
@ -336,7 +338,6 @@ static void acm_ctrl_irq(struct urb *urb)
break; break;
} }
exit: exit:
usb_mark_last_busy(acm->dev);
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with " dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with "