TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: keyspan: add a sanity test on "len"

Browse Source 
"len" comes from the USB transfer and it's probably correct.  The thing
is that we already have similar checks like:

        if (data[i] >= serial->num_ports) {

So adding a sanity test here matches the rest of the code and is a good
idea.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter
2013-04-05 08:43:20 +03:00
committed by Greg Kroah-Hartman
parent 6a3ae8412f
commit 01a60e76b6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usb/serial/keyspan.c
+3 -2
View File
@@ -741,14 +741,15 @@ static void usa49wg_indat_callback(struct urb *urb)
if ((data[i] & 0x80) == 0) { if ((data[i] & 0x80) == 0) {
/* no error on any byte */ /* no error on any byte */
i++; i++;
for (x = 1; x < len ; ++x) for (x = 1; x < len && i < urb->actual_length; ++x)
tty_insert_flip_char(&port->port, tty_insert_flip_char(&port->port,
data[i++], 0); data[i++], 0);
} else { } else {
/* /*
* some bytes had errors, every byte has status * some bytes had errors, every byte has status
*/ */
for (x = 0; x + 1 < len; x += 2) { for (x = 0; x + 1 < len &&
i + 1 < urb->actual_length; x += 2) {
int stat = data[i], flag = 0; int stat = data[i], flag = 0;
if (stat & RXERROR_OVERRUN) if (stat & RXERROR_OVERRUN)