lkml.org 
[lkml]   [2011]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[19/23] USB: cdc-acm: fix potential null-pointer dereference on disconnect
    From: Johan Hovold <jhovold@gmail.com>

    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>

    ---
    drivers/usb/class/cdc-acm.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- 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 "



    \
     
     \ /
      Last update: 2011-03-26 01:01    [W:0.022 / U:0.280 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site