Commit e0746615 authored by Johan Hovold's avatar Johan Hovold Committed by Khalid Elmously

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

BugLink: https://bugs.launchpad.net/bugs/1860681

[ Upstream commit e37d1aed ]

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>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 8c358ec8
...@@ -640,7 +640,7 @@ static void edge_interrupt_callback(struct urb *urb) ...@@ -640,7 +640,7 @@ static void edge_interrupt_callback(struct urb *urb)
if (txCredits) { if (txCredits) {
port = edge_serial->serial->port[portNumber]; port = edge_serial->serial->port[portNumber];
edge_port = usb_get_serial_port_data(port); 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, spin_lock_irqsave(&edge_port->ep_lock,
flags); flags);
edge_port->txCredits += txCredits; edge_port->txCredits += txCredits;
...@@ -1780,7 +1780,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, ...@@ -1780,7 +1780,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
if (rxLen && edge_serial->rxPort < serial->num_ports) { if (rxLen && edge_serial->rxPort < serial->num_ports) {
port = serial->port[edge_serial->rxPort]; port = serial->port[edge_serial->rxPort];
edge_port = usb_get_serial_port_data(port); 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", dev_dbg(dev, "%s - Sending %d bytes to TTY for port %d\n",
__func__, rxLen, __func__, rxLen,
edge_serial->rxPort); edge_serial->rxPort);
......
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