lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 196/294] usb: usbtest: fix NULL pointer dereference
    3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Alan Stern <stern@rowland.harvard.edu>

    commit 7c80f9e4a588f1925b07134bb2e3689335f6c6d8 upstream.

    If the usbtest driver encounters a device with an IN bulk endpoint but
    no OUT bulk endpoint, it will try to dereference a NULL pointer
    (out->desc.bEndpointAddress). The problem can be solved by adding a
    missing test.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Reported-by: Andrey Konovalov <andreyknvl@google.com>
    Tested-by: Andrey Konovalov <andreyknvl@google.com>
    Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/misc/usbtest.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/usb/misc/usbtest.c
    +++ b/drivers/usb/misc/usbtest.c
    @@ -164,12 +164,13 @@ found:
    return tmp;
    }

    - if (in) {
    + if (in)
    dev->in_pipe = usb_rcvbulkpipe(udev,
    in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
    + if (out)
    dev->out_pipe = usb_sndbulkpipe(udev,
    out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
    - }
    +
    if (iso_in) {
    dev->iso_in = &iso_in->desc;
    dev->in_iso_pipe = usb_rcvisocpipe(udev,
    \
     
     \ /
      Last update: 2017-11-08 20:58    [W:4.164 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site