Skip to contentSkip to conversation

USB: serial: fix potential NULL-dereference at probe

PATCH New Johan Hovold 1 participant 1 message Oct 21, 2016

Subsystems (3)
lore
Share & tools
lore

Johan Hovold

author maintainer
#0 lore raw

PATCH 1/1 USB: serial: fix potential NULL-dereference at probe

Make sure we have at least one port before attempting to register a console.

Currently, at least one driver binds to a "dummy" interface and requests zero ports for it. Should such an interface also lack endpoints, we get a NULL-deref during probe.

Fixes e5b1e2062e05 ("USB: serial: make minor allocation dynamic")
Cc stable <[email protected]> # 3.11
---
 drivers/usb/serial/usb-serial.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/serial/usb-serial.c +2 -1
index d213cf44a7e4..4a037b4a79cf 100644
@@ -1078,7 +1078,8 @@ static int usb_serial_probe(struct usb_interface *interface,
 
 	serial->disconnected = 0;
 
-	usb_serial_console_init(serial->port[0]->minor);
+	if (num_ports > 0)
+		usb_serial_console_init(serial->port[0]->minor);
 exit:
 	module_put(type->driver.owner);
 	return 0;
Signature · 1 line
2.7.3