diff options
| author | Johan Hovold <johan@kernel.org> | 2018-08-21 11:59:53 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2018-08-27 11:53:19 +0200 |
| commit | 5dfdd24eb3d39d815bc952ae98128e967c9bba49 (patch) | |
| tree | 1ce413a794e451a15c44e4c951511bb38e5885fe /drivers/usb/serial/ti_usb_3410_5052.c | |
| parent | 691a03cfe8ca483f9c48153b869d354e4ae3abef (diff) | |
| download | linux-5dfdd24eb3d39d815bc952ae98128e967c9bba49.tar.gz | |
USB: serial: ti_usb_3410_5052: fix array underflow in completion handler
Similarly to a recently reported bug in io_ti, a malicious USB device
could set port_number to a negative value and we would underflow the
port array in the interrupt completion handler.
As these devices only have one or two ports, fix this by making sure we
only consider the seventh bit when determining the port number (and
ignore bits 0xb0 which are typically set to 0x30).
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
| -rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 3010878f7f8ed..e3c5832337e0b 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c @@ -1119,7 +1119,7 @@ static void ti_break(struct tty_struct *tty, int break_state) static int ti_get_port_from_code(unsigned char code) { - return (code >> 4) - 3; + return (code >> 6) & 0x01; } static int ti_get_func_from_code(unsigned char code) |