diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-03-10 10:32:41 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-03-10 10:32:41 -0400 |
| commit | c5a0a261f027209e931d26b4c70be7afc31f0fd6 (patch) | |
| tree | 4fd74a035e9d50fd728af8bd8e43108a95b1e0d8 /drivers/net/usb/gl620a.c | |
| parent | 7ae9a11fb0f3913687d9b586979261437aeb6550 (diff) | |
| parent | 6969595f011b46b49c3f1b9e0bd7da27768c1fd9 (diff) | |
Merge tag 'v3.10.33' into v3.10-rt
This is the 3.10.33 stable release
Diffstat (limited to 'drivers/net/usb/gl620a.c')
| -rw-r--r-- | drivers/net/usb/gl620a.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c index a7e3f4e55bf3..82ab61d62804 100644 --- a/drivers/net/usb/gl620a.c +++ b/drivers/net/usb/gl620a.c @@ -86,6 +86,10 @@ static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb) u32 size; u32 count; + /* This check is no longer done by usbnet */ + if (skb->len < dev->net->hard_header_len) + return 0; + header = (struct gl_header *) skb->data; // get the packet count of the received skb |