From: Miaohe Lin Date: Sat, 15 Aug 2020 08:44:31 +0000 (-0400) Subject: net: Fix potential wrong skb->protocol in skb_vlan_untag() X-Git-Tag: v4.14.196~90 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5d28f39d847e75678901d9bb1f18a4cbd8bd7e60;p=users%2Fdwmw2%2Flinux.git net: Fix potential wrong skb->protocol in skb_vlan_untag() [ Upstream commit 55eff0eb7460c3d50716ed9eccf22257b046ca92 ] We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). So we should pull VLAN_HLEN + sizeof(unsigned short) in skb_vlan_untag() or we may access the wrong data. Fixes: 0d5501c1c828 ("net: Always untag vlan-tagged traffic on input.") Signed-off-by: Miaohe Lin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b1933e1f3aef9..4c0f637bbf8b8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5053,8 +5053,8 @@ struct sk_buff *skb_vlan_untag(struct sk_buff *skb) skb = skb_share_check(skb, GFP_ATOMIC); if (unlikely(!skb)) goto err_free; - - if (unlikely(!pskb_may_pull(skb, VLAN_HLEN))) + /* We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). */ + if (unlikely(!pskb_may_pull(skb, VLAN_HLEN + sizeof(unsigned short)))) goto err_free; vhdr = (struct vlan_hdr *)skb->data;