diff options
| author | Ian Coolidge <iancoolidge@gmail.com> | 2012-11-06 21:00:10 (GMT) |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-11-08 14:04:50 (GMT) |
| commit | 23834e533184bd2185bce500c789f86b3668739b (patch) | |
| tree | 149f705a0ce8460e24b247e8f9e4359dc6cf2e63 | |
| parent | be44f1c80b998b00cfa1759f4ba88f6497810963 (diff) | |
| download | linux-23834e533184bd2185bce500c789f86b3668739b.tar.xz | |
usb: gadget: g_ether: fix frame size check
Checking skb->len against ETH_FRAME_LEN assumes a 1514
ethernet frame size. With an 802.1Q VLAN header, ethernet
frame length can now be 1518. Validate frame length against that.
Signed-off-by: Ian Coolidge <iancoolidge@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/u_ether.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 6458764..4ec3c0d 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c @@ -20,6 +20,7 @@ #include <linux/ctype.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> +#include <linux/if_vlan.h> #include "u_ether.h" @@ -295,7 +296,7 @@ static void rx_complete(struct usb_ep *ep, struct usb_request *req) while (skb2) { if (status < 0 || ETH_HLEN > skb2->len - || skb2->len > ETH_FRAME_LEN) { + || skb2->len > VLAN_ETH_FRAME_LEN) { dev->net->stats.rx_errors++; dev->net->stats.rx_length_errors++; DBG(dev, "rx length %d\n", skb2->len); |