Skip to contentSkip to conversation

openvswitch: fix the calculation of checksum for vlan header

PATCH Applied Cong Wang 3 participants 5 messages Feb 22, 2013 – Feb 24, 2013

Subsystems (3)
lore
Share & tools
lore

Cong Wang

author
#0 lore raw

PATCH 1/2 openvswitch: fix the calculation of checksum for vlan header

From: Cong Wang <[email protected]>

In vlan_insert_tag(), we insert a 4-byte VLAN header _after_ mac header:

        memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN);
        ...
        veth->h_vlan_proto = htons(ETH_P_8021Q);
        ...
        veth->h_vlan_TCI = htons(vlan_tci);

so after it, we should recompute the checksum to include these 4 bytes. skb->data still points to the mac header, therefore VLAN header is at (2 * ETH_ALEN = 12) bytes after it, not (ETH_HLEN = 14) bytes.

This can also be observed via tcpdump:

         0x0000:  ffff ffff ffff 5254 005d 6f6e 8100 000a
         0x0010:  0806 0001 0800 0604 0001 5254 005d 6f6e
         0x0020:  c0a8 026e 0000 0000 0000 c0a8 0282

Similar for __pop_vlan_tci(), the vlan header we remove is the one overwritten in:

	memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN);

Therefore the VLAN_HLEN = 4 bytes after 2 * ETH_ALEN is the part we want to sub from checksum.

Cc David S. Miller <[email protected]>
Cc Jesse Gross <[email protected]>
---
 net/openvswitch/actions.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/openvswitch/actions.c +2 -2
index ac2defe..d4d5363 100644
@@ -58,7 +58,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci)
 
 	if (skb->ip_summed == CHECKSUM_COMPLETE)
 		skb->csum = csum_sub(skb->csum, csum_partial(skb->data
-					+ ETH_HLEN, VLAN_HLEN, 0));
+					+ (2 * ETH_ALEN), VLAN_HLEN, 0));
 
 	vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN);
 	*current_tci = vhdr->h_vlan_TCI;
@@ -115,7 +115,7 @@ static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan *vla
 
 		if (skb->ip_summed == CHECKSUM_COMPLETE)
 			skb->csum = csum_add(skb->csum, csum_partial(skb->data
-					+ ETH_HLEN, VLAN_HLEN, 0));
+					+ (2 * ETH_ALEN), VLAN_HLEN, 0));
 
 	}
 	__vlan_hwaccel_put_tag(skb, ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);
Signature · 1 line
1.7.7.6
author
#1 lore raw

PATCH 2/2 vlan: adjust vlan_set_encap_proto() for its callers

From: Cong Wang <[email protected]>

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 <[email protected]>
Cc Jesse Gross <[email protected]>
---
 include/linux/if_vlan.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
include/linux/if_vlan.h +3 -3
index d06cc5c..218a3b6 100644
@@ -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
Signature · 1 line
1.7.7.6
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] vlan: adjust vlan_set_encap_proto() for its callers

Quoted 24 lines · Cong Wang

From: Cong Wang <[email protected]>

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)
        ...
Quoted 8 lines

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 <[email protected]>
Cc Jesse Gross <[email protected]>
maintainer Applied
#3 lore raw

Re: [PATCH 2/2] vlan: adjust vlan_set_encap_proto() for its callers

From: Jesse Gross <[email protected]>
Date: Fri, 22 Feb 2013 17:05:01 -0800

Quoted 27 lines · Cong Wang
Quoted 26 lines

From: Cong Wang <[email protected]>

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.

Quoted 8 lines
Quoted 6 lines

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 <[email protected]>
Cc Jesse Gross <[email protected]>

Applied, thanks.

Applied
#4 lore raw
In reply to Cong Wang
Quoted 24 lines · Cong Wang

From: Cong Wang <[email protected]>

In vlan_insert_tag(), we insert a 4-byte VLAN header _after_ mac header:

        memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN);
        ...
        veth->h_vlan_proto = htons(ETH_P_8021Q);
        ...
        veth->h_vlan_TCI = htons(vlan_tci);

so after it, we should recompute the checksum to include these 4 bytes. skb->data still points to the mac header, therefore VLAN header is at (2 * ETH_ALEN = 12) bytes after it, not (ETH_HLEN = 14) bytes.

This can also be observed via tcpdump:

         0x0000:  ffff ffff ffff 5254 005d 6f6e 8100 000a
         0x0010:  0806 0001 0800 0604 0001 5254 005d 6f6e
         0x0020:  c0a8 026e 0000 0000 0000 c0a8 0282

Similar for __pop_vlan_tci(), the vlan header we remove is the one overwritten in:

Quoted 8 lines
        memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN);

Therefore the VLAN_HLEN = 4 bytes after 2 * ETH_ALEN is the part we want to sub from checksum.

Cc David S. Miller <[email protected]>
Cc Jesse Gross <[email protected]>

Applied, thanks.