diff options
| author | Johan Hovold <johan@kernel.org> | 2016-01-12 11:05:20 (GMT) |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2016-01-25 10:36:41 (GMT) |
| commit | cac9b50b0d75a1d50d6c056ff65c005f3224c8e0 (patch) | |
| tree | 8364098c15fab73add4f52148debd7b2ce917e20 | |
| parent | f487c54ddd544e1c9172cd510954f697b77b76e3 (diff) | |
| download | linux-cac9b50b0d75a1d50d6c056ff65c005f3224c8e0.tar.xz | |
USB: visor: fix null-deref at probe
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")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
| -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 60afb39..c53fbb3 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -544,6 +544,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, |