diff --git a/[refs] b/[refs] index 5da04fc6c67d..cdf65cc21e8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d62a66e4211546f9e5c5d1ad586749a51cf30db +refs/heads/master: 6c15d74defd38e7e7f8805392578b7a1d508097e diff --git a/trunk/drivers/net/usb/asix.c b/trunk/drivers/net/usb/asix.c index dbdca225b846..df2b08dbbf9e 100644 --- a/trunk/drivers/net/usb/asix.c +++ b/trunk/drivers/net/usb/asix.c @@ -376,7 +376,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) skb_pull(skb, (size + 1) & 0xfffe); - if (skb->len == 0) + if (skb->len < sizeof(header)) break; head = (u8 *) skb->data;