lkml.org 
[lkml]   [2012]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 072/108] USB: CDC ACM: Fix NULL pointer dereference
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Sven Schnelle <svens@stackframe.org>

    commit 99f347caa4568cb803862730b3b1f1942639523f upstream.

    If a device specifies zero endpoints in its interface descriptor,
    the kernel oopses in acm_probe(). Even though that's clearly an
    invalid descriptor, we should test wether we have all endpoints.
    This is especially bad as this oops can be triggered by just
    plugging a USB device in.

    Signed-off-by: Sven Schnelle <svens@stackframe.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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
    @@ -1104,7 +1104,8 @@ skip_normal_probe:
    }


    - if (data_interface->cur_altsetting->desc.bNumEndpoints < 2)
    + if (data_interface->cur_altsetting->desc.bNumEndpoints < 2 ||
    + control_interface->cur_altsetting->desc.bNumEndpoints == 0)
    return -EINVAL;

    epctrl = &control_interface->cur_altsetting->endpoint[0].desc;



    \
     
     \ /
      Last update: 2012-09-13 05:01    [W:6.164 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site