Skip to content

Commit

Permalink
USB: serial: iuu_phoenix: fix NULL-deref at open
Browse files Browse the repository at this point in the history
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: 07c3b1a ("USB: remove broken usb-serial num_endpoints
check")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
  • Loading branch information
Johan Hovold committed Jan 4, 2017
1 parent e35d6d7 commit 90507d5
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/usb/serial/iuu_phoenix.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,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;
Expand Down Expand Up @@ -1196,6 +1206,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,
};
Expand Down

0 comments on commit 90507d5

Please sign in to comment.