patch "USB: visor: fix null-deref at probe" added to usb-linus

This is a note to let you know that I've just added the patch titled

USB: visor: fix null-deref at probe

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From: Johan Hovold <[email protected]>
Date: Tue, 12 Jan 2016 12:05:20 +0100
Subject: 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.

---
 drivers/usb/serial/visor.c | 5 +++++
 1 file changed, 5 insertions(+)

index 60afb39eb73c..c53fbb3e0b8c 100644
@@ -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,

2.7.0