Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c75633e authored by Johan Hovold's avatar Johan Hovold
Browse files

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



Fix NULL-pointer dereference in open() should the device lack the
expected endpoints:

Unable to handle kernel NULL pointer dereference at virtual address 00000030
...
PC is at mos7840_open+0x88/0x8dc [mos7840]

Note that we continue to treat the interrupt-in endpoint as optional for
now.

Fixes: 3f542974 ("USB: Moschip 7840 USB-Serial Driver")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 9da049bc

drivers/usb/serial/mos7840.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -2113,6 +2113,17 @@ static int mos7840_calc_num_ports(struct usb_serial *serial) 
	return mos7840_num_ports;

	return mos7840_num_ports;

}

}





static int mos7840_attach(struct usb_serial *serial)

{

	if (serial->num_bulk_in < serial->num_ports ||

			serial->num_bulk_out < serial->num_ports) {

		dev_err(&serial->interface->dev, "missing endpoints\n");

		return -ENODEV;

	}



	return 0;

}



static int mos7840_port_probe(struct usb_serial_port *port)

static int mos7840_port_probe(struct usb_serial_port *port)

{

{

	struct usb_serial *serial = port->serial;

	struct usb_serial *serial = port->serial;
@@ -2388,6 +2399,7 @@ static struct usb_serial_driver moschip7840_4port_device = { 
	.tiocmset = mos7840_tiocmset,

	.tiocmset = mos7840_tiocmset,

	.tiocmiwait = usb_serial_generic_tiocmiwait,

	.tiocmiwait = usb_serial_generic_tiocmiwait,

	.get_icount = usb_serial_generic_get_icount,

	.get_icount = usb_serial_generic_get_icount,

	.attach = mos7840_attach,

	.port_probe = mos7840_port_probe,

	.port_probe = mos7840_port_probe,

	.port_remove = mos7840_port_remove,

	.port_remove = mos7840_port_remove,

	.read_bulk_callback = mos7840_bulk_in_callback,

	.read_bulk_callback = mos7840_bulk_in_callback,