Commit 7fbfac87 authored by Johan Hovold's avatar Johan Hovold Committed by Sasha Levin

USB: serial: fix potential NULL-dereference at probe

[ Upstream commit 126d26f6 ]

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: e5b1e206 ("USB: serial: make minor allocation dynamic")
Cc: stable <stable@vger.kernel.org>	# 3.11
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 605a6960
...@@ -1077,7 +1077,8 @@ static int usb_serial_probe(struct usb_interface *interface, ...@@ -1077,7 +1077,8 @@ static int usb_serial_probe(struct usb_interface *interface,
serial->disconnected = 0; serial->disconnected = 0;
usb_serial_console_init(serial->port[0]->minor); if (num_ports > 0)
usb_serial_console_init(serial->port[0]->minor);
exit: exit:
module_put(type->driver.owner); module_put(type->driver.owner);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment