diff options
| author | Johan Hovold <johan@kernel.org> | 2016-01-12 14:05:20 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-11 17:43:53 +0300 |
| commit | d53a0262f6738c81193e000b2975a7183be521f3 (patch) | |
| tree | d553ad42cdf454daf94daba8a3996fcf7ec0a551 /drivers/usb | |
| parent | 9112aa764e14174e8b1b3e035c77c5a33103e64a (diff) | |
| download | linux-d53a0262f6738c81193e000b2975a7183be521f3.tar.xz | |
USB: visor: fix null-deref at probe
commit cac9b50b0d75a1d50d6c056ff65c005f3224c8e0 upstream.
Fix null-pointer dereference at probe should a (malicious) Treo device
lack the expected endpoints.
Specifically, the Treo port-setup hack was dereferencing the bulk-in and
interrupt-in urbs without first making sure they had been allocated by
core.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/visor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index 9c61a8671721..605068e6acf2 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -551,6 +551,11 @@ static int treo_attach(struct usb_serial *serial) (serial->num_interrupt_in == 0)) return 0; + if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) { + dev_err(&serial->interface->dev, "missing endpoints\n"); + return -ENODEV; + } + /* * It appears that Treos and Kyoceras want to use the * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint, |