diff options
author | Johan Hovold <johan@kernel.org> | 2017-03-06 11:36:37 -0500 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2017-03-08 10:14:36 -0500 |
commit | 0b1d250afb8eb9d65afb568bac9b9f9253a82b49 (patch) | |
tree | 7afcb58437e1546ecf0cb2779b17572ae32a3862 | |
parent | 2e46565cf622dd0534a9d8bffe152a577b48d7aa (diff) |
USB: serial: io_ti: fix NULL-deref in interrupt callback
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")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r-- | drivers/usb/serial/io_ti.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index ceaeebaa6f90..4561dd4cde8b 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -1674,6 +1674,12 @@ static void edge_interrupt_callback(struct urb *urb) | |||
1674 | function = TIUMP_GET_FUNC_FROM_CODE(data[0]); | 1674 | function = TIUMP_GET_FUNC_FROM_CODE(data[0]); |
1675 | dev_dbg(dev, "%s - port_number %d, function %d, info 0x%x\n", __func__, | 1675 | dev_dbg(dev, "%s - port_number %d, function %d, info 0x%x\n", __func__, |
1676 | port_number, function, data[1]); | 1676 | port_number, function, data[1]); |
1677 | |||
1678 | if (port_number >= edge_serial->serial->num_ports) { | ||
1679 | dev_err(dev, "bad port number %d\n", port_number); | ||
1680 | goto exit; | ||
1681 | } | ||
1682 | |||
1677 | port = edge_serial->serial->port[port_number]; | 1683 | port = edge_serial->serial->port[port_number]; |
1678 | edge_port = usb_get_serial_port_data(port); | 1684 | edge_port = usb_get_serial_port_data(port); |
1679 | if (!edge_port) { | 1685 | if (!edge_port) { |