From: Johan Hovold Date: Tue, 12 Jan 2016 11:05:20 +0000 (+0100) Subject: USB: visor: fix null-deref at probe X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f1a9ca0d6949ec920c7e34a1eb48dbf55e84f8ed;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Greg Kroah-Hartman --- 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,