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

[karo-tx-linux.git] / drivers / usb / serial / keyspan.c

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 3d92394aba3a28770d10abf7064a724cc87b4d69..025310bc358a929d9a02ec7300a9c3609f1d025e 100644 (file)
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -741,14 +741,15 @@ static void usa49wg_indat_callback(struct urb *urb)
                if ((data[i] & 0x80) == 0) {
                        /* no error on any byte */
                        i++;
-                       for (x = 1; x < len ; ++x)
+                       for (x = 1; x < len && i < urb->actual_length; ++x)
                                tty_insert_flip_char(&port->port,
                                                data[i++], 0);
                } else {
                        /*
                         * 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;
 
                                if (stat & RXERROR_OVERRUN)