Patch "USB: serial: digi_acceleport: fix OOB data sanity check" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
USB: serial: digi_acceleport: fix OOB data sanity check
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
2d380889215fe20b8523345649dee0579821800cMon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Tue, 31 Jan 2017 17:17:27 +0100
Subject: USB: serial: digi_acceleport: fix OOB data sanity check
From: Johan Hovold <[email protected]>
commit 2d380889215fe20b8523345649dee0579821800c upstream.
Make sure to check for short transfers to avoid underflow in a loop condition when parsing the receive buffer.
Also fix an off-by-one error in the incomplete sanity check which could lead to invalid data being parsed.
--- drivers/usb/serial/digi_acceleport.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/usb/serial/digi_acceleport.c +9 -5
@@ -1483,16 +1483,20 @@ static int digi_read_oob_callback(structstruct usb_serial *serial = port->serial;struct tty_struct *tty;struct digi_port *priv =usb_get_serial_port_data (port); +unsigned char *buf = urb->transfer_buffer;int opcode, line, status, val;int i;unsigned int rts; +if (urb->actual_length <4 ) +return -1 ; +/* handle each oob command */ -for (i =0 ; i < urb->actual_length -3 ;) { - opcode = ((unsigned char *)urb->transfer_buffer)[i++]; - line = ((unsigned char *)urb->transfer_buffer)[i++]; - status = ((unsigned char *)urb->transfer_buffer)[i++]; - val = ((unsigned char *)urb->transfer_buffer)[i++]; +for (i =0 ; i < urb->actual_length -4 ; i +=4 ) { + opcode = buf[i]; + line = buf[i +1 ]; + status = buf[i +2 ]; + val = buf[i +3 ];dev_dbg (&port->dev,"digi_read_oob_callback: opcode=%d, line=%d, status=%d, val=%d\n" , opcode, line, status, val);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/usb-serial-digi_acceleport-fix-oob-event-processing.patch queue-4.4/usb-serial-digi_acceleport-fix-oob-data-sanity-check.patch