summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/visor.c
diff options
context:
space:
mode:
authorVladis Dronov <vdronov@redhat.com>2016-01-12 15:10:50 +0100
committerJohan Hovold <johan@kernel.org>2016-01-25 11:40:45 +0100
commitcb3232138e37129e88240a98a1d2aba2187ff57c (patch)
tree8ae9c425fef05e38b0aab0ecf18372de2c5820ca /drivers/usb/serial/visor.c
parentcac9b50b0d75a1d50d6c056ff65c005f3224c8e0 (diff)
downloadop-kernel-dev-cb3232138e37129e88240a98a1d2aba2187ff57c.zip
op-kernel-dev-cb3232138e37129e88240a98a1d2aba2187ff57c.tar.gz
USB: serial: visor: fix crash on detecting device without write_urbs
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: cfb8da8f69b8 ("USB: visor: fix initialisation of UX50/TH55 devices") Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/visor.c')
-rw-r--r--drivers/usb/serial/visor.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index c53fbb3..337a0be 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -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];
OpenPOWER on IntegriCloud