Commit 5182c2cf authored by Johan Hovold's avatar Johan Hovold

USB: serial: mos7840: fix another NULL-deref at open

Fix another NULL-pointer dereference at open should a malicious device
lack an interrupt-in endpoint.

Note that the driver has a broken check for an interrupt-in endpoint
which means that an interrupt URB has never even been submitted.

Fixes: 3f542974 ("USB: Moschip 7840 USB-Serial Driver")
Cc: stable <stable@vger.kernel.org>	# v2.6.19: 5c75633eReviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 0e517c93
...@@ -1034,6 +1034,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -1034,6 +1034,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
* (can't set it up in mos7840_startup as the structures * * (can't set it up in mos7840_startup as the structures *
* were not set up at that time.) */ * were not set up at that time.) */
if (port0->open_ports == 1) { if (port0->open_ports == 1) {
/* FIXME: Buffer never NULL, so URB is not submitted. */
if (serial->port[0]->interrupt_in_buffer == NULL) { if (serial->port[0]->interrupt_in_buffer == NULL) {
/* set up interrupt urb */ /* set up interrupt urb */
usb_fill_int_urb(serial->port[0]->interrupt_in_urb, usb_fill_int_urb(serial->port[0]->interrupt_in_urb,
...@@ -2116,7 +2117,8 @@ static int mos7840_calc_num_ports(struct usb_serial *serial) ...@@ -2116,7 +2117,8 @@ static int mos7840_calc_num_ports(struct usb_serial *serial)
static int mos7840_attach(struct usb_serial *serial) static int mos7840_attach(struct usb_serial *serial)
{ {
if (serial->num_bulk_in < serial->num_ports || if (serial->num_bulk_in < serial->num_ports ||
serial->num_bulk_out < serial->num_ports) { serial->num_bulk_out < serial->num_ports ||
serial->num_interrupt_in < 1) {
dev_err(&serial->interface->dev, "missing endpoints\n"); dev_err(&serial->interface->dev, "missing endpoints\n");
return -ENODEV; return -ENODEV;
} }
......
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