]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: serial: io_ti: fix NULL-deref in interrupt callback
authorJohan Hovold <johan@kernel.org>
Mon, 6 Mar 2017 16:36:37 +0000 (17:36 +0100)
committerWilly Tarreau <w@1wt.eu>
Wed, 7 Jun 2017 22:47:03 +0000 (00:47 +0200)
commit 0b1d250afb8eb9d65afb568bac9b9f9253a82b49 upstream.

Fix a NULL-pointer dereference in the interrupt callback should a
malicious device send data containing a bad port number by adding the
missing sanity check.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/usb/serial/io_ti.c

index e1b3e79b7073573ea09c1ef3c97da7ad95d8590d..e2dc182150fb8ffc12c124c10e37e29f9e31dd73 100644 (file)
@@ -1575,6 +1575,12 @@ static void edge_interrupt_callback(struct urb *urb)
        function    = TIUMP_GET_FUNC_FROM_CODE(data[0]);
        dev_dbg(dev, "%s - port_number %d, function %d, info 0x%x\n", __func__,
                port_number, function, data[1]);
+
+       if (port_number >= edge_serial->serial->num_ports) {
+               dev_err(dev, "bad port number %d\n", port_number);
+               goto exit;
+       }
+
        port = edge_serial->serial->port[port_number];
        edge_port = usb_get_serial_port_data(port);
        if (!edge_port) {