[PATCH] USB speedtouch: discard packets for non-existant vcc's

I broke part of the udsl_decode_rawcell logic in a previous patch, leading to
possible hangs on startup/shutdown.  I've attached the 2.4 and 2.5 versions.
Thanks to Subodh Srivastava and Ted Phelps for their bug reports.  Here is the
2.5 patch included inline for reference:

diff --git a/drivers/usb/misc/speedtch.c b/drivers/usb/misc/speedtch.c
index 9d2c7d00ce0d2c9f414eb6c97e4da151bcc61a45..05b5cbec19d6312212242714e160a1031766b39f 100644 (file)
--- a/drivers/usb/misc/speedtch.c
+++ b/drivers/usb/misc/speedtch.c
@@ -278,9 +278,10 @@ static struct sk_buff *udsl_decode_rawcell (struct udsl_instance_data *instance,
 
                /* here should the header CRC check be... */
 
-               if (!(vcc = udsl_find_vcc (instance, vpi, vci)))
+               if (!(vcc = udsl_find_vcc (instance, vpi, vci))) {
                        dbg ("udsl_decode_rawcell: no vcc found for packet on vpi %d, vci %d", vpi, vci);
-               else {
+                       __skb_pull (skb, min (skb->len, (unsigned) 53));
+               } else {
                        dbg ("udsl_decode_rawcell found vcc %p for packet on vpi %d, vci %d", vcc, vpi, vci);
 
                        if (skb->len >= 53) {
@@ -323,8 +324,8 @@ static struct sk_buff *udsl_decode_rawcell (struct udsl_instance_data *instance,
                                skb_pull (skb, 53);
                        } else {
                                /* If data is corrupt and skb doesn't hold a whole cell, flush the lot */
-                               if (skb_pull (skb, 53) == NULL)
-                                       return NULL;
+                               __skb_pull (skb, skb->len);
+                               return NULL;
                        }
                }
        }