]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: serial: io_edgeport: handle unbound ports on URB completion
authorJohan Hovold <johan@kernel.org>
Fri, 17 Jan 2020 09:50:23 +0000 (10:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 07:21:27 +0000 (08:21 +0100)
commit e37d1aeda737a20b1846a91a3da3f8b0f00cf690 upstream.

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: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/io_edgeport.c

index 97eb738b058fa85463d2c46dc23f45625a67d685..a1df22d3ae36dd2d5eb77f57a70672459893a5b5 100644 (file)
@@ -716,7 +716,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;
@@ -1843,7 +1843,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
                                port = edge_serial->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);