lkml.org 
[lkml]   [2017]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 046/250] USB: serial: iuu_phoenix: fix NULL-deref at open
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 90507d54f712d81b74815ef3a4bbb555cd9fab2f upstream.

    Fix NULL-pointer dereference at open should the device lack a bulk-in or
    bulk-out endpoint:

    Unable to handle kernel NULL pointer dereference at virtual address 00000030
    ...
    PC is at iuu_open+0x78/0x59c [iuu_phoenix]

    Fixes: 07c3b1a10016 ("USB: remove broken usb-serial num_endpoints
    check")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/usb/serial/iuu_phoenix.c | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
    index 790673e..eadab62 100644
    --- a/drivers/usb/serial/iuu_phoenix.c
    +++ b/drivers/usb/serial/iuu_phoenix.c
    @@ -69,6 +69,16 @@ struct iuu_private {
    u32 clk;
    };

    +static int iuu_attach(struct usb_serial *serial)
    +{
    + unsigned char num_ports = serial->num_ports;
    +
    + if (serial->num_bulk_in < num_ports || serial->num_bulk_out < num_ports)
    + return -ENODEV;
    +
    + return 0;
    +}
    +
    static int iuu_port_probe(struct usb_serial_port *port)
    {
    struct iuu_private *priv;
    @@ -1199,6 +1209,7 @@ static struct usb_serial_driver iuu_device = {
    .tiocmset = iuu_tiocmset,
    .set_termios = iuu_set_termios,
    .init_termios = iuu_init_termios,
    + .attach = iuu_attach,
    .port_probe = iuu_port_probe,
    .port_remove = iuu_port_remove,
    };
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-06-12 01:14    [W:3.556 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site