diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:18 +0000 |
| commit | 561ba47707bf63cac3d97143ab5928353d47459e (patch) | |
| tree | 1cdcdc0c6deef63e1822768e4283ce82330c7aa3 /drivers/net/usb/gl620a.c | |
| parent | 0a92210a812d913cfb99cb959ec75f27473af664 (diff) | |
| parent | 6969595f011b46b49c3f1b9e0bd7da27768c1fd9 (diff) | |
Merge tag 'v3.10.33' into linux-linaro-lsk
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 |