Skip to contentSkip to conversation

bridge: clean the nf_bridge status when forwarding the skb

RFC In review Antonio Quartulli 3 participants 9 messages Sep 26, 2013 – Oct 14, 2013

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

RFC 1/1 bridge: clean the nf_bridge status when forwarding the skb

From: Antonio Quartulli <[email protected]>

Even if enslaving a bridge interface into another bridge is forbidden, it is still possible to create a chain of virtual interfaces including two distinct bridges.

In this case, the skb entering the second bridge could have the nf_bridge field already set due to a previous operation and consequently lead to a wrong processing of the packet itself.

To prevent this behaviour release and set to NULL the nf_bridge field of the skb when exiting the bridge interface.

---

I am not sure if this is a wanted behaviour or a real BUG. I found this "misbehaviour" while testing batman-adv with the following configuration:

- br0 (bridge interface) having bat0 and eth0 as slaves
- bat0 (which is a virtual interface provided by the batman-adv module and that works similarly to a bridge - to some extends) having br1 as slave
- br1 (second bridge interface) having eth1 as slave

Then follow these events:
- a broadcast packet arrives on eth0
- the skb enters br0 and skb->nf_bridge gets initialised and used
- the skb enters bat0 and the packet *gets encapsulated in the batman-adv packet which adds a batman-adv header and another Ethernet header*
- the skb enters br1 and gets ruined because nf_bridge_maybe_copy_header() (in br_dev_queue_push_xmit()) will try to restore an header that does not make sense anymore.

With this patch the nf_bridge gets de-initialised before exiting br0 and therefore it is processed properly inside br1: nf_bridge_maybe_copy_header() does not take place at all because nf_bridge is never initialised (the packet is non-IP since it is a batman-adv packet)

To the developers of the bridge module I would like to ask:
1) is skb->nf_bridge allowed to be non NULL when entering br_dev_xmit() ? If so, when is this supposed to happen?

2) do you think this patch is logically correct but the nf_bridge release should be done in batman-adv since it is the one re-encapsulating the packet?

I hope I have made the problem clear.

Best regards,

 net/bridge/br_forward.c | 5 +++++
 1 file changed, 5 insertions(+)
net/bridge/br_forward.c +5 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 
Signature · 1 line
1.8.1.5
#1 lore raw
Quoted 61 lines · On Thu, 26 Sep 2013 22:19:50 +0200 Antonio Quartulli <[email protected]>…

From: Antonio Quartulli <[email protected]>

Even if enslaving a bridge interface into another bridge is forbidden, it is still possible to create a chain of virtual interfaces including two distinct bridges.

In this case, the skb entering the second bridge could have the nf_bridge field already set due to a previous operation and consequently lead to a wrong processing of the packet itself.

To prevent this behaviour release and set to NULL the nf_bridge field of the skb when exiting the bridge interface.

---

I am not sure if this is a wanted behaviour or a real BUG. I found this "misbehaviour" while testing batman-adv with the following configuration:

- br0 (bridge interface) having bat0 and eth0 as slaves
- bat0 (which is a virtual interface provided by the batman-adv module and that works similarly to a bridge - to some extends) having br1 as slave
- br1 (second bridge interface) having eth1 as slave

Then follow these events:
- a broadcast packet arrives on eth0
- the skb enters br0 and skb->nf_bridge gets initialised and used
- the skb enters bat0 and the packet *gets encapsulated in the batman-adv packet which adds a batman-adv header and another Ethernet header*
- the skb enters br1 and gets ruined because nf_bridge_maybe_copy_header() (in br_dev_queue_push_xmit()) will try to restore an header that does not make sense anymore.

With this patch the nf_bridge gets de-initialised before exiting br0 and therefore it is processed properly inside br1: nf_bridge_maybe_copy_header() does not take place at all because nf_bridge is never initialised (the packet is non-IP since it is a batman-adv packet)

To the developers of the bridge module I would like to ask:
1) is skb->nf_bridge allowed to be non NULL when entering br_dev_xmit() ? If so, when is this supposed to happen?

2) do you think this patch is logically correct but the nf_bridge release should be done in batman-adv since it is the one re-encapsulating the packet?

I hope I have made the problem clear.

Best regards,

 net/bridge/br_forward.c | 5 +++++
 1 file changed, 5 insertions(+)
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 10 lines
net/bridge/br_forward.c +5 -0
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

You need to bracket this with CONFIG_BRIDGE_NETFILTER since nf_bridge is only in skbuff if that option is enabled.

#2 lore raw
In reply to Antonio Quartulli
Quoted 61 lines · On Thu, 26 Sep 2013 22:19:50 +0200 Antonio Quartulli <[email protected]>…

From: Antonio Quartulli <[email protected]>

Even if enslaving a bridge interface into another bridge is forbidden, it is still possible to create a chain of virtual interfaces including two distinct bridges.

In this case, the skb entering the second bridge could have the nf_bridge field already set due to a previous operation and consequently lead to a wrong processing of the packet itself.

To prevent this behaviour release and set to NULL the nf_bridge field of the skb when exiting the bridge interface.

---

I am not sure if this is a wanted behaviour or a real BUG. I found this "misbehaviour" while testing batman-adv with the following configuration:

- br0 (bridge interface) having bat0 and eth0 as slaves
- bat0 (which is a virtual interface provided by the batman-adv module and that works similarly to a bridge - to some extends) having br1 as slave
- br1 (second bridge interface) having eth1 as slave

Then follow these events:
- a broadcast packet arrives on eth0
- the skb enters br0 and skb->nf_bridge gets initialised and used
- the skb enters bat0 and the packet *gets encapsulated in the batman-adv packet which adds a batman-adv header and another Ethernet header*
- the skb enters br1 and gets ruined because nf_bridge_maybe_copy_header() (in br_dev_queue_push_xmit()) will try to restore an header that does not make sense anymore.

With this patch the nf_bridge gets de-initialised before exiting br0 and therefore it is processed properly inside br1: nf_bridge_maybe_copy_header() does not take place at all because nf_bridge is never initialised (the packet is non-IP since it is a batman-adv packet)

To the developers of the bridge module I would like to ask:
1) is skb->nf_bridge allowed to be non NULL when entering br_dev_xmit() ? If so, when is this supposed to happen?

2) do you think this patch is logically correct but the nf_bridge release should be done in batman-adv since it is the one re-encapsulating the packet?

I hope I have made the problem clear.

Best regards,

 net/bridge/br_forward.c | 5 +++++
 1 file changed, 5 insertions(+)
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 10 lines
net/bridge/br_forward.c +5 -0
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

I think the header will also be garbage if bridge on bridge with netfilter is used. See nf_bridge_save_header.

#3 lore raw
Quoted 58 lines · Stephen Hemminger
Quoted 55 lines · On Thu, 26 Sep 2013 22:19:50 +0200 Antonio Quartulli <[email protected]>…

From: Antonio Quartulli <[email protected]>

Even if enslaving a bridge interface into another bridge is forbidden, it is still possible to create a chain of virtual interfaces including two distinct bridges.

In this case, the skb entering the second bridge could have the nf_bridge field already set due to a previous operation and consequently lead to a wrong processing of the packet itself.

To prevent this behaviour release and set to NULL the nf_bridge field of the skb when exiting the bridge interface.

---

I am not sure if this is a wanted behaviour or a real BUG. I found this "misbehaviour" while testing batman-adv with the following configuration:

- br0 (bridge interface) having bat0 and eth0 as slaves
- bat0 (which is a virtual interface provided by the batman-adv module and that works similarly to a bridge - to some extends) having br1 as slave
- br1 (second bridge interface) having eth1 as slave

Then follow these events:
- a broadcast packet arrives on eth0
- the skb enters br0 and skb->nf_bridge gets initialised and used
- the skb enters bat0 and the packet *gets encapsulated in the batman-adv packet which adds a batman-adv header and another Ethernet header*
- the skb enters br1 and gets ruined because nf_bridge_maybe_copy_header() (in br_dev_queue_push_xmit()) will try to restore an header that does not make sense anymore.

With this patch the nf_bridge gets de-initialised before exiting br0 and therefore it is processed properly inside br1: nf_bridge_maybe_copy_header() does not take place at all because nf_bridge is never initialised (the packet is non-IP since it is a batman-adv packet)

To the developers of the bridge module I would like to ask:
1) is skb->nf_bridge allowed to be non NULL when entering br_dev_xmit() ? If so, when is this supposed to happen?

2) do you think this patch is logically correct but the nf_bridge release should be done in batman-adv since it is the one re-encapsulating the packet?

I hope I have made the problem clear.

Best regards,

 net/bridge/br_forward.c | 5 +++++
 1 file changed, 5 insertions(+)
Quoted 16 lines
Quoted 6 lines
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 10 lines
net/bridge/br_forward.c +5 -0
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

Regarding CONFIG_BRIDGE_NETFILTER you are right, thanks.

Quoted 3 lines

I think the header will also be garbage if bridge on bridge with netfilter is used. See nf_bridge_save_header.

What header are you referring to? nf_bridge_save_header() saves the header in skb->nf_bridge->data, which is freed during nf_bridge_put() (assuming ->use reached 0).

Signature · 1 line
Antonio Quartulli
#4 lore raw
Quoted 79 lines · On Thu, 26 Sep 2013 23:16:48 +0200 Antonio Quartulli <[email protected]>…
Quoted 58 lines · Stephen Hemminger
Quoted 55 lines · On Thu, 26 Sep 2013 22:19:50 +0200 Antonio Quartulli <[email protected]>…

From: Antonio Quartulli <[email protected]>

Even if enslaving a bridge interface into another bridge is forbidden, it is still possible to create a chain of virtual interfaces including two distinct bridges.

In this case, the skb entering the second bridge could have the nf_bridge field already set due to a previous operation and consequently lead to a wrong processing of the packet itself.

To prevent this behaviour release and set to NULL the nf_bridge field of the skb when exiting the bridge interface.

---

I am not sure if this is a wanted behaviour or a real BUG. I found this "misbehaviour" while testing batman-adv with the following configuration:

- br0 (bridge interface) having bat0 and eth0 as slaves
- bat0 (which is a virtual interface provided by the batman-adv module and that works similarly to a bridge - to some extends) having br1 as slave
- br1 (second bridge interface) having eth1 as slave

Then follow these events:
- a broadcast packet arrives on eth0
- the skb enters br0 and skb->nf_bridge gets initialised and used
- the skb enters bat0 and the packet *gets encapsulated in the batman-adv packet which adds a batman-adv header and another Ethernet header*
- the skb enters br1 and gets ruined because nf_bridge_maybe_copy_header() (in br_dev_queue_push_xmit()) will try to restore an header that does not make sense anymore.

With this patch the nf_bridge gets de-initialised before exiting br0 and therefore it is processed properly inside br1: nf_bridge_maybe_copy_header() does not take place at all because nf_bridge is never initialised (the packet is non-IP since it is a batman-adv packet)

To the developers of the bridge module I would like to ask:
1) is skb->nf_bridge allowed to be non NULL when entering br_dev_xmit() ? If so, when is this supposed to happen?

2) do you think this patch is logically correct but the nf_bridge release should be done in batman-adv since it is the one re-encapsulating the packet?

I hope I have made the problem clear.

Best regards,

 net/bridge/br_forward.c | 5 +++++
 1 file changed, 5 insertions(+)
Quoted 16 lines
Quoted 6 lines
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 10 lines
net/bridge/br_forward.c +5 -0
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

Regarding CONFIG_BRIDGE_NETFILTER you are right, thanks.

Quoted 1 line
Quoted 8 lines
Quoted 2 lines

I think the header will also be garbage if bridge on bridge with netfilter is used. See nf_bridge_save_header.

What header are you referring to? nf_bridge_save_header() saves the header in skb->nf_bridge->data, which is freed during nf_bridge_put() (assuming ->use reached 0).

If bridge is stacked the original ether header will get overwritten by the second call to save_header.

#5 lore raw
Quoted 23 lines · Stephen Hemminger
Quoted 23 lines
Quoted 8 lines
Quoted 8 lines
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
Quoted 8 lines

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 8 lines
net/bridge/br_forward.c +5 -0
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

Regarding CONFIG_BRIDGE_NETFILTER you are right, thanks.

Quoted 3 lines

I think the header will also be garbage if bridge on bridge with netfilter is used. See nf_bridge_save_header.

Quoted 8 lines
Quoted 5 lines

What header are you referring to? nf_bridge_save_header() saves the header in skb->nf_bridge->data, which is freed during nf_bridge_put() (assuming ->use reached 0).

If bridge is stacked the original ether header will get overwritten by the second call to save_header.

Sorry, but I am not getting what you mean (I am new to the code and it is late here..):
save_header() will store the Ethernet header in nf_bridge->data for
later recover (if needed).

By freeing nf_bridge I also destroy this header copy.

When the skb enters the second bridge, save_header() will save again the header in nf_bridge->data. But I don't see how this can create a problem.

The problem I had before this patch comes from the fact that nf_bridge_copy_header() is invoked in the second bridge with the nf_bridge state of the first. This was overwriting my the packet Ethernet header with what the first invocation of save_header() stored in nf_bridge->data.

But by unsetting nf_bridge I think I am preventing this from happening again. no?

Signature · 1 line
Antonio Quartulli
#6 lore raw
Quoted 42 lines · Antonio Quartulli
Quoted 23 lines · Stephen Hemminger
Quoted 23 lines
Quoted 8 lines
Quoted 8 lines
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
Quoted 8 lines

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 8 lines
net/bridge/br_forward.c +5 -0
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

Regarding CONFIG_BRIDGE_NETFILTER you are right, thanks.

Quoted 3 lines

I think the header will also be garbage if bridge on bridge with netfilter is used. See nf_bridge_save_header.

Quoted 8 lines
Quoted 5 lines

What header are you referring to? nf_bridge_save_header() saves the header in skb->nf_bridge->data, which is freed during nf_bridge_put() (assuming ->use reached 0).

If bridge is stacked the original ether header will get overwritten by the second call to save_header.

Sorry, but I am not getting what you mean (I am new to the code and it is late here..):
save_header() will store the Ethernet header in nf_bridge->data for
later recover (if needed).

By freeing nf_bridge I also destroy this header copy.

When the skb enters the second bridge, save_header() will save again the header in nf_bridge->data. But I don't see how this can create a problem.

Quoted 7 lines

The problem I had before this patch comes from the fact that nf_bridge_copy_header() is invoked in the second bridge with the nf_bridge state of the first. This was overwriting my the packet Ethernet header with what the first invocation of save_header() stored in nf_bridge->data.

But by unsetting nf_bridge I think I am preventing this from happening again. no?

Hello Stephen,

do you have other comments about this patch? I know it is rather difficult that a generic user hits this issue, but I'd like to see it fixed because other people using batman-adv may incur in this problem.

Cheers,

Signature · 1 line
Antonio Quartulli
#7 lore raw
Quoted 51 lines · On Tue, 15 Oct 2013 00:20:10 +0200 Antonio Quartulli <[email protected]>…
Quoted 42 lines · Antonio Quartulli
Quoted 23 lines · Stephen Hemminger
Quoted 23 lines
Quoted 8 lines
Quoted 8 lines
net/bridge/br_forward.c +0 -0
index 4b81b14..65864bc 100644
@@ -49,6 +49,11 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
 	} else {
 		skb_push(skb, ETH_HLEN);
 		br_drop_fake_rtable(skb);
Quoted 8 lines

net/bridge/br_forward.c int br_dev_queue_push_xmit(struct sk_buff *skb) · line 59

Quoted 8 lines
net/bridge/br_forward.c +5 -0
+
+		/* clean the NF bridge data */
+		nf_bridge_put(skb->nf_bridge);
+		skb->nf_bridge = NULL;
+
 		dev_queue_xmit(skb);
 	}
 

Regarding CONFIG_BRIDGE_NETFILTER you are right, thanks.

Quoted 3 lines

I think the header will also be garbage if bridge on bridge with netfilter is used. See nf_bridge_save_header.

Quoted 8 lines
Quoted 5 lines

What header are you referring to? nf_bridge_save_header() saves the header in skb->nf_bridge->data, which is freed during nf_bridge_put() (assuming ->use reached 0).

If bridge is stacked the original ether header will get overwritten by the second call to save_header.

Sorry, but I am not getting what you mean (I am new to the code and it is late here..):
save_header() will store the Ethernet header in nf_bridge->data for
later recover (if needed).

By freeing nf_bridge I also destroy this header copy.

When the skb enters the second bridge, save_header() will save again the header in nf_bridge->data. But I don't see how this can create a problem.

Quoted 7 lines

The problem I had before this patch comes from the fact that nf_bridge_copy_header() is invoked in the second bridge with the nf_bridge state of the first. This was overwriting my the packet Ethernet header with what the first invocation of save_header() stored in nf_bridge->data.

But by unsetting nf_bridge I think I am preventing this from happening again. no?

Quoted 9 lines

Hello Stephen,

do you have other comments about this patch? I know it is rather difficult that a generic user hits this issue, but I'd like to see it fixed because other people using batman-adv may incur in this problem.

Cheers,

The patch content is fine, but it needs necessary ifdef's.
I would also prefer to have the clean done as a function that can be stubbed out like the other bridge netfilter stuff.

#8 lore raw
Quoted 4 lines · Stephen Hemminger

The patch content is fine, but it needs necessary ifdef's.
I would also prefer to have the clean done as a function that can be stubbed out like the other bridge netfilter stuff.

Ok, I will apply those changes and I will send it as PATCH.

Thank you very much for your feedback!

Regards,

Signature · 1 line
Antonio Quartulli