diff options
| author | Li RongQing <roy.qing.li@gmail.com> | 2013-03-11 20:30:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 11:47:40 -0400 |
| commit | c80a8512ee3a8e1f7c3704140ea55f21dc6bd651 (patch) | |
| tree | 5f0f6c5728e8794905031bd2110d70cdc0a4cb10 | |
| parent | 45549a68a592dd1daed72aaf4df2295931b93138 (diff) | |
| download | op-kernel-dev-c80a8512ee3a8e1f7c3704140ea55f21dc6bd651.zip op-kernel-dev-c80a8512ee3a8e1f7c3704140ea55f21dc6bd651.tar.gz | |
net/core: move vlan_depth out of while loop in skb_network_protocol()
[ Bug added added in commit 05e8ef4ab2d8087d (net: factor out
skb_mac_gso_segment() from skb_gso_segment() ) ]
move vlan_depth out of while loop, or else vlan_depth always is ETH_HLEN,
can not be increased, and lead to infinite loop when frame has two vlan headers.
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index dffbef7..d540ced 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2219,9 +2219,9 @@ struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb, struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); struct packet_offload *ptype; __be16 type = skb->protocol; + int vlan_depth = ETH_HLEN; while (type == htons(ETH_P_8021Q)) { - int vlan_depth = ETH_HLEN; struct vlan_hdr *vh; if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN))) |
