diff options
| author | Vladis Dronov <vdronov@redhat.com> | 2016-01-12 15:10:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-19 14:22:40 -0800 |
| commit | 3b079e37731a962211c65e9aff9928f3ac2e6840 (patch) | |
| tree | c8f8761d0b29b29229ba642aaebeaad000561fc1 | |
| parent | 24e1fdb327b97cde4ff92e7ceca86f9882a723e6 (diff) | |
| download | linux-stable-3b079e37731a962211c65e9aff9928f3ac2e6840.tar.gz linux-stable-3b079e37731a962211c65e9aff9928f3ac2e6840.tar.bz2 linux-stable-3b079e37731a962211c65e9aff9928f3ac2e6840.zip | |
USB: serial: visor: fix crash on detecting device without write_urbs
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>
Fixes: cfb8da8f69b8 ("USB: visor: fix initialisation of UX50/TH55 devices")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/visor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 727905de0ba4..9c61a8671721 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -604,8 +604,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]; |