Skip to content

Commit

Permalink
USB: serial: fix potential NULL-dereference at probe
Browse files Browse the repository at this point in the history
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: e5b1e20 ("USB: serial: make minor allocation dynamic")
Cc: stable <stable@vger.kernel.org>	# 3.11
Signed-off-by: Johan Hovold <johan@kernel.org>
  • Loading branch information
Johan Hovold committed Oct 21, 2016
1 parent de24e0a commit 126d26f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 126d26f

Please sign in to comment.