vlan: adjust vlan_set_encap_proto() for its callers
authorCong Wang <amwang@redhat.com>
Thu, 21 Feb 2013 23:32:27 +0000 (23:32 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 Feb 2013 02:00:06 +0000 (21:00 -0500)
There are two places to call vlan_set_encap_proto():
vlan_untag() and __pop_vlan_tci().

vlan_untag() assumes skb->data points after mac addr, otherwise
the following code

        vhdr = (struct vlan_hdr *) skb->data;
        vlan_tci = ntohs(vhdr->h_vlan_TCI);
        __vlan_hwaccel_put_tag(skb, vlan_tci);

        skb_pull_rcsum(skb, VLAN_HLEN);

won't be correct. But __pop_vlan_tci() assumes points _before_
mac addr.

In vlan_set_encap_proto(), it looks for some magic L2 value
after mac addr:

        rawp = skb->data;
        if (*(unsigned short *) rawp == 0xFFFF)
...

Therefore __pop_vlan_tci() is obviously wrong.

A quick fix is avoiding using skb->data in vlan_set_encap_proto(),
use 'vhdr+1' is always correct in both cases.

Cc: David S. Miller <davem@davemloft.net>
Cc: Jesse Gross <jesse@nicira.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/if_vlan.h

index d06cc5c8f58cf3a58ed34101f362a0b9be0fc0a6..218a3b686d90600f313d1e423a752b9cc36a9dad 100644 (file)
@@ -331,7 +331,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
                                        struct vlan_hdr *vhdr)
 {
        __be16 proto;
-       unsigned char *rawp;
+       unsigned short *rawp;
 
        /*
         * Was a VLAN packet, grab the encapsulated protocol, which the layer
@@ -344,8 +344,8 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
                return;
        }
 
-       rawp = skb->data;
-       if (*(unsigned short *) rawp == 0xFFFF)
+       rawp = (unsigned short *)(vhdr + 1);
+       if (*rawp == 0xFFFF)
                /*
                 * This is a magic hack to spot IPX packets. Older Novell
                 * breaks the protocol design and runs IPX over 802.3 without