patch "USB: serial: ti_usb_3410_5052: fix array underflow in completion" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
USB: serial: ti_usb_3410_5052: fix array underflow in completion
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
5dfdd24eb3d39d815bc952ae98128e967c9bba49Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Tue, 21 Aug 2018 11:59:53 +0200
Subject: 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).
--- drivers/usb/serial/ti_usb_3410_5052.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/ti_usb_3410_5052.c +1 -1
@@ -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)
Signature · 1 line
2.18.0