Skip to contentSkip to conversation

net: bridge: check the length of skb after nf_bridge_maybe_copy_header()

PATCH In review Changli Gao 3 participants 8 messages Dec 25, 2010 – Jan 6, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: bridge: check the length of skb after nf_bridge_maybe_copy_header()

Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs.

---
 net/bridge/br_forward.c |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
net/bridge/br_forward.c +6 -10
index 2bd11ec..ee64287 100644
@@ -41,17 +41,13 @@ static inline unsigned packet_length(const struct sk_buff *skb)
 
 int br_dev_queue_push_xmit(struct sk_buff *skb)
 {
-	/* drop mtu oversized packets except gso */
-	if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))
+	/* ip_fragment doesn't copy the MAC header */
+	if (nf_bridge_maybe_copy_header(skb) ||
+	    (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb))) {
 		kfree_skb(skb);
-	else {
-		/* ip_fragment doesn't copy the MAC header */
-		if (nf_bridge_maybe_copy_header(skb))
-			kfree_skb(skb);
-		else {
-			skb_push(skb, ETH_HLEN);
-			dev_queue_xmit(skb);
-		}
+	} else {
+		skb_push(skb, ETH_HLEN);
+		dev_queue_xmit(skb);
 	}
 
 	return 0;
maintainer
#1 lore raw

From: Changli Gao <[email protected]>
Date: Sat, 25 Dec 2010 21:41:30 +0800

Quoted 4 lines

Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs.

This is really strange.

packet_length() subtracts VLAN_HLEN from the value it returns, so the correct fix seems to be to make this function handle the PPPOE case too.

Otherwise I suspect you have many other functions to fix as well.

I'm not applying this patch.

#2 lore raw
Quoted 6 lines · David Miller

From: Changli Gao <[email protected]>
Date: Sat, 25 Dec 2010 21:41:30 +0800

Quoted 3 lines

Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs.

Quoted 8 lines
Quoted 1 line

This is really strange.

packet_length() subtracts VLAN_HLEN from the value it returns, so the correct fix seems to be to make this function handle the PPPOE case too.

It is correct. The actual MTU of 802.1q frame is 4 bytes larger. For example, the MTU of ethernet is normally 1500, however the actual MTU of the 802.1Q is 1504.

Please see this patch:
http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commitdiff;h=c893b8066c7bf6156e4d760e5acaf4c148e37190;hp=3c0fef0b7d36e5f8d3ea3731a8228102274e3c23

Quoted 4 lines

Otherwise I suspect you have many other functions to fix as well.

I'm not applying this patch.

Signature · 2 lines
Regards,
Changli Gao([email protected])
maintainer
#3 lore raw

From: Changli Gao <[email protected]>
Date: Mon, 3 Jan 2011 18:44:59 +0800

Quoted 11 lines · David Miller
Quoted 10 lines

From: Changli Gao <[email protected]>
Date: Sat, 25 Dec 2010 21:41:30 +0800

Quoted 4 lines

Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs.

This is really strange.

Quoted 8 lines
Quoted 4 lines

packet_length() subtracts VLAN_HLEN from the value it returns, so the correct fix seems to be to make this function handle the PPPOE case too.

It is correct. The actual MTU of 802.1q frame is 4 bytes larger. For example, the MTU of ethernet is normally 1500, however the actual MTU of the 802.1Q is 1504.

Yes, I understand this, but I don't see why packet_length() cannot simply account for PPPOE's encapsulation overhead just as it does for VLAN's special MTU considerations.

#4 lore raw
Quoted 19 lines · On Mon, 03 Jan 2011 09:22:14 -0800 (PST) David Miller <[email protected]>…

From: Changli Gao <[email protected]>
Date: Mon, 3 Jan 2011 18:44:59 +0800

Quoted 16 lines · David Miller
Quoted 14 lines

From: Changli Gao <[email protected]>
Date: Sat, 25 Dec 2010 21:41:30 +0800

Quoted 4 lines

Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs.

This is really strange.

packet_length() subtracts VLAN_HLEN from the value it returns, so the correct fix seems to be to make this function handle the PPPOE case too.

Quoted 7 lines
Quoted 3 lines

It is correct. The actual MTU of 802.1q frame is 4 bytes larger. For example, the MTU of ethernet is normally 1500, however the actual MTU of the 802.1Q is 1504.

Yes, I understand this, but I don't see why packet_length() cannot simply account for PPPOE's encapsulation overhead just as it does for VLAN's special MTU considerations.

Because PPPOE happens afterwards and is not part the calculation. The check should be moved until after skb has reached final form.

maintainer
#5 lore raw

From: Stephen Hemminger <[email protected]>
Date: Mon, 3 Jan 2011 10:15:33 -0800

Quoted 26 lines
Quoted 23 lines · On Mon, 03 Jan 2011 09:22:14 -0800 (PST) David Miller <[email protected]>…

From: Changli Gao <[email protected]>
Date: Mon, 3 Jan 2011 18:44:59 +0800

Quoted 19 lines · David Miller
Quoted 6 lines

From: Changli Gao <[email protected]>
Date: Sat, 25 Dec 2010 21:41:30 +0800

Quoted 3 lines

Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs.

Quoted 8 lines
Quoted 1 line

This is really strange.

packet_length() subtracts VLAN_HLEN from the value it returns, so the correct fix seems to be to make this function handle the PPPOE case too.

It is correct. The actual MTU of 802.1q frame is 4 bytes larger. For example, the MTU of ethernet is normally 1500, however the actual MTU of the 802.1Q is 1504.

Quoted 6 lines
Quoted 3 lines

Yes, I understand this, but I don't see why packet_length() cannot simply account for PPPOE's encapsulation overhead just as it does for VLAN's special MTU considerations.

Because PPPOE happens afterwards and is not part the calculation. The check should be moved until after skb has reached final form.

That works for me.

#6 lore raw
Quoted 7 lines · David Miller

From: Stephen Hemminger <[email protected]>

Quoted 3 lines

Because PPPOE happens afterwards and is not part the calculation. The check should be moved until after skb has reached final form.

That works for me.

So, is my patch acceptable?

Signature · 2 lines
Regards,
Changli Gao([email protected])
maintainer
#7 lore raw

From: Changli Gao <[email protected]>
Date: Wed, 5 Jan 2011 21:37:28 +0800

Quoted 10 lines · David Miller
Quoted 7 lines

From: Stephen Hemminger <[email protected]>

Quoted 3 lines

Because PPPOE happens afterwards and is not part the calculation. The check should be moved until after skb has reached final form.

That works for me.

So, is my patch acceptable?

Yes, I've applied it, thank you.