USB: ipaq: fix oops when device is plugged in

This patch (as1293) fixes a problem with the ipaq serial driver. It tries to bind to all the interfaces, even those that don't have enough endpoints. The symptom is an invalid memory reference and oops when the device is plugged in. Signed-off-by: Alan Stern <[email protected]> CC: stable <[email protected]> Tested-by: Matthias Geissert <[email protected]> Tested-by: Tilman Schmidt <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
kishon · Oct 9, 2009 · 06bad89 · 06bad89
1 parent b0a9cf2
commit 06bad89
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
@@ -966,6 +966,15 @@ static int ipaq_calc_num_ports(struct usb_serial *serial)
 static int ipaq_startup(struct usb_serial *serial)
 {
 	dbg("%s", __func__);
+
+	/* Some of the devices in ipaq_id_table[] are composite, and we
+	 * shouldn't bind to all the interfaces.  This test will rule out
+	 * some obviously invalid possibilities.
+	 */
+	if (serial->num_bulk_in < serial->num_ports ||
+			serial->num_bulk_out < serial->num_ports)
+		return -ENODEV;
+
 	if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
 		/*
 		 * FIXME: HP iPaq rx3715, possibly others, have 1 config that