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

Commit 72af08ee authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: io_edgeport: handle unbound ports on URB completion 



[ Upstream commit e37d1aeda737a20b1846a91a3da3f8b0f00cf690 ]

Check for NULL port data in the shared interrupt and bulk completion
callbacks to avoid dereferencing a NULL pointer in case a device sends
data for a port device which isn't bound to a driver (e.g. due to a
malicious device having unexpected endpoints or after an allocation
failure on port probe).

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3d70345a

drivers/usb/serial/io_edgeport.c

+2 −2
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static void edge_interrupt_callback(struct urb *urb) 
			if (txCredits) {

				port = edge_serial->serial->port[portNumber];

				edge_port = usb_get_serial_port_data(port);

				if (edge_port->open) {

				if (edge_port && edge_port->open) {

					spin_lock_irqsave(&edge_port->ep_lock,

							  flags);

					edge_port->txCredits += txCredits;
@@ -1776,7 +1776,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, 
			if (rxLen && edge_serial->rxPort < serial->num_ports) {

				port = serial->port[edge_serial->rxPort];

				edge_port = usb_get_serial_port_data(port);

				if (edge_port->open) {

				if (edge_port && edge_port->open) {

					dev_dbg(dev, "%s - Sending %d bytes to TTY for port %d\n",

						__func__, rxLen,

						edge_serial->rxPort);