iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: serial: keyspan_pda: fix receive sanity checks

Browse Source 
Make sure to check for short transfers before parsing the receive buffer
to avoid acting on stale data.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2017-01-31 17:17:29 +01:00
parent 1b0aed2b16
commit c528fcb116
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/serial/keyspan_pda.c
View File

@ -139,6 +139,7 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
{ {
struct usb_serial_port *port = urb->context; struct usb_serial_port *port = urb->context;
unsigned char *data = urb->transfer_buffer; unsigned char *data = urb->transfer_buffer;
unsigned int len = urb->actual_length;
int retval; int retval;
int status = urb->status; int status = urb->status;
struct keyspan_pda_private *priv; struct keyspan_pda_private *priv;
@ -159,18 +160,26 @@ static void keyspan_pda_rx_interrupt(struct urb *urb)
goto exit; goto exit;
} }
if (len < 1) {
dev_warn(&port->dev, "short message received\n");
goto exit;
}
/* see if the message is data or a status interrupt */ /* see if the message is data or a status interrupt */
switch (data[0]) { switch (data[0]) {
case 0: case 0:
/* rest of message is rx data */ /* rest of message is rx data */
if (urb->actual_length) { if (len < 2)
tty_insert_flip_string(&port->port, data + 1, break;
urb->actual_length - 1); tty_insert_flip_string(&port->port, data + 1, len - 1);
tty_flip_buffer_push(&port->port); tty_flip_buffer_push(&port->port);
}
break; break;
case 1: case 1:
/* status interrupt */ /* status interrupt */
if (len < 3) {
dev_warn(&port->dev, "short interrupt message received\n");
break;
}
dev_dbg(&port->dev, "rx int, d1=%d, d2=%d\n", data[1], data[2]); dev_dbg(&port->dev, "rx int, d1=%d, d2=%d\n", data[1], data[2]);
switch (data[1]) { switch (data[1]) {
case 1: /* modemline change */ case 1: /* modemline change */