Skip to content

Commit

Permalink
USB: serial: visor: fix crash on detecting device without write_urbs
Browse files Browse the repository at this point in the history
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>
Fixes: cfb8da8 ("USB: visor: fix initialisation of UX50/TH55 devices")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
  • Loading branch information
nefigtut authored and jhovold committed Jan 25, 2016
1 parent cac9b50 commit cb32321
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/usb/serial/visor.c
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,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 */
port = serial->port[0];
Expand Down

0 comments on commit cb32321

Please sign in to comment.