lkml.org 
[lkml]   [2016]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2.6.32 01/55] usb: serial: visor: fix crash on detecting device without write_urbs
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

    From: Vladis Dronov <vdronov@redhat.com>

    commit cb3232138e37129e88240a98a1d2aba2187ff57c upstream.

    The visor driver crashes in clie_5_attach() when a specially crafted USB
    device without bulk-out endpoint is detected. This fix adds a check that
    the device has proper configuration expected by the driver.

    Reported-by: Ralf Spenneberg <ralf@spenneberg.net>
    Signed-off-by: Vladis Dronov <vdronov@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/usb/serial/visor.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
    index 9af8c2f..e9229c5 100644
    --- a/drivers/usb/serial/visor.c
    +++ b/drivers/usb/serial/visor.c
    @@ -921,8 +921,10 @@ static int clie_5_attach(struct usb_serial *serial)
    */

    /* some sanity check */
    - if (serial->num_ports < 2)
    - return -1;
    + if (serial->num_bulk_out < 2) {
    + dev_err(&serial->interface->dev, "missing bulk out endpoints\n");
    + return -ENODEV;
    + }

    /* port 0 now uses the modified endpoint Address */
    serial->port[0]->bulk_out_endpointAddress =
    --
    1.7.12.2.21.g234cd45.dirty


    \
     
     \ /
      Last update: 2016-03-04 18:01    [W:4.105 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site