bridge: allow receiption on disabled port
Subsystems (3)
PATCH 1/1 bridge: allow receiption on disabled port
When an ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet receiption is blocked.
This breaks control applications like WPA which maybe expecting to receive packets to negotiate to bring link up. The bridge needs to block forwarding packets from these disabled ports, but there is no hard requirement to not allow local packet delivery.
--- net/bridge/br_input.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
net/bridge/br_input.c +17 -3
@@ -146,9 +146,11 @@ static int br_handle_local_finish(struct sk_buff *skb)struct net_bridge_port *p =br_port_get_rcu (skb->dev);u16 vid =0 ; -br_vlan_get_tag (skb, &vid); -if (p->flags &BR_LEARNING ) -br_fdb_update (p->br, p,eth_hdr (skb)->h_source, vid); +if (p->state !=BR_STATE_DISABLED ) { +br_vlan_get_tag (skb, &vid); +if (p->flags &BR_LEARNING ) +br_fdb_update (p->br, p,eth_hdr (skb)->h_source, vid); + }return 0 ;/* process further */ }
@@ -218,6 +220,18 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb) forward:switch (p->state) { +case BR_STATE_DISABLED : +if (ether_addr_equal (p->br->dev->dev_addr, dest)) + skb->pkt_type =PACKET_HOST ; + +if (NF_HOOK (NFPROTO_BRIDGE ,NF_BR_PRE_ROUTING , skb, skb->dev,NULL , + br_handle_local_finish)) +break ; + +BR_INPUT_SKB_CB (skb)->brdev = p->br->dev; +br_pass_frame_up (skb); +break ; +case BR_STATE_FORWARDING : rhook =rcu_dereference (br_should_route_hook);if (rhook) {
Signature · 1 line
1.8.0.2
Quoted 11 lines · On Thu, 10 Oct 2013 14:52:50 +0200 Felix Fietkau <[email protected]> wrote:
When an ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet receiption is blocked.
This breaks control applications like WPA which maybe expecting to receive packets to negotiate to bring link up. The bridge needs to block forwarding packets from these disabled ports, but there is no hard requirement to not allow local packet delivery.
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>
No. This will cause duplicate packets to be delivered.
If doing a link layer protocol like WPA then it should be done directly on the underlying device, not the bridge itself.
Quoted 12 lines · Stephen Hemminger
Quoted 9 lines · On Thu, 10 Oct 2013 14:52:50 +0200 Felix Fietkau <[email protected]> wrote:
When an ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet receiption is blocked.
This breaks control applications like WPA which maybe expecting to receive packets to negotiate to bring link up. The bridge needs to block forwarding packets from these disabled ports, but there is no hard requirement to not allow local packet delivery.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>No. This will cause duplicate packets to be delivered.
How? I haven't observed any duplications in my tests with this patch.
Quoted 2 lines
If doing a link layer protocol like WPA then it should be done directly on the underlying device, not the bridge itself.
When the ETH_P_PAE protocol is set for the packet socket inside wpa_supplicant, the bridge steals all packets before the protocol handler gets them.
In __netif_receive_skb_core, only ptype_all gets processed before the rx handler, not ptype_base.
- Felix
Quoted 13 lines · On Thu, 10 Oct 2013 22:56:33 +0200 Felix Fietkau <[email protected]> wrote:
Quoted 12 lines · Stephen Hemminger
Quoted 9 lines · On Thu, 10 Oct 2013 14:52:50 +0200 Felix Fietkau <[email protected]> wrote:
When an ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet receiption is blocked.
This breaks control applications like WPA which maybe expecting to receive packets to negotiate to bring link up. The bridge needs to block forwarding packets from these disabled ports, but there is no hard requirement to not allow local packet delivery.
Quoted 5 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>No. This will cause duplicate packets to be delivered.
How? I haven't observed any duplications in my tests with this patch.
The purpose of DISABLED state is to break loops in the bridge tree. If packet is flooded by another bridge (Broadcast Unknown or Multicast) then it will go down both paths.
Quoted 8 lines
Quoted 3 lines
If doing a link layer protocol like WPA then it should be done directly on the underlying device, not the bridge itself.
When the
ETH_P_PAEprotocol is set for the packet socket insidewpa_supplicant, the bridge steals all packets before the protocol handler gets them.
In__netif_receive_skb_core, onlyptype_allgets processed before the rx handler, notptype_base.
Thought it was using direct type all. Or at least the link local multicast address.
Can you revise it to only accept packets directed to link local multicast address or local address, and go through the local_finish handler.
Quoted 19 lines · Stephen Hemminger
Quoted 16 lines · On Thu, 10 Oct 2013 22:56:33 +0200 Felix Fietkau <[email protected]> wrote:
Quoted 15 lines · Stephen Hemminger
Quoted 11 lines · On Thu, 10 Oct 2013 14:52:50 +0200 Felix Fietkau <[email protected]> wrote:
When an ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet receiption is blocked.
This breaks control applications like WPA which maybe expecting to receive packets to negotiate to bring link up. The bridge needs to block forwarding packets from these disabled ports, but there is no hard requirement to not allow local packet delivery.
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
No. This will cause duplicate packets to be delivered.
How? I haven't observed any duplications in my tests with this patch.
The purpose of DISABLED state is to break loops in the bridge tree. If packet is flooded by another bridge (Broadcast Unknown or Multicast) then it will go down both paths.
Ah, right.
Quoted 8 lines
Quoted 7 lines
Quoted 2 lines
If doing a link layer protocol like WPA then it should be done directly on the underlying device, not the bridge itself.
When the
ETH_P_PAEprotocol is set for the packet socket insidewpa_supplicant, the bridge steals all packets before the protocol handler gets them.
In__netif_receive_skb_core, onlyptype_allgets processed before the rx handler, notptype_base.
Quoted 5 lines
Thought it was using direct type all. Or at least the link local multicast address.
Can you revise it to only accept packets directed to link local multicast address or local address, and go through the
local_finishhandler.
The destination address in WPA EAPOL packets from the AP is set to the MAC address of the client, which may not be the same as the one from the bridge.
- Felix
This is what I was thinking would be better.
Don't want these packets leaking into PRE_ROUTEING chain or have any chance to get flooded out other ports.
Compile tested only...
I could use another goto instead but that becomes spaghetti and never like to jump back into a block.
net/bridge/br_input.c +20 -8
@@ -152,6 +152,16 @@ static int br_handle_local_finish(structreturn 0 ;/* process further */ } +/* Deliver packet to local host only */ +static rx_handler_result_t br_local_only (struct sk_buff *skb) +{ +if (NF_HOOK (NFPROTO_BRIDGE ,NF_BR_LOCAL_IN , skb, skb->dev, +NULL , br_handle_local_finish)) +return RX_HANDLER_CONSUMED ;/* consumed by filter */ +else +return RX_HANDLER_PASS ;/* continue processing */ +} +/* * Return NULL if skb is handled * note: already called with rcu_read_lock
@@ -206,18 +216,20 @@ rx_handler_result_t br_handle_frame(stru goto forward; } -/* Deliver packet to local host only */ -if (NF_HOOK (NFPROTO_BRIDGE ,NF_BR_LOCAL_IN , skb, skb->dev, -NULL , br_handle_local_finish)) { -return RX_HANDLER_CONSUMED ;/* consumed by filter */ - }else { - *pskb = skb; -return RX_HANDLER_PASS ;/* continue processing */ - } + *pskb = skb; +return br_local_only (skb); } forward:switch (p->state) { +case BR_STATE_DISABLED : +if (!ether_addr_equal (p->br->dev->dev_addr, dest)) + goto drop; + + skb->pkt_type =PACKET_HOST ; + *pskb = skb; +return br_local_only (skb); +case BR_STATE_FORWARDING : rhook =rcu_dereference (br_should_route_hook);if (rhook) {
Quoted 9 lines · Stephen Hemminger
This is what I was thinking would be better.
Don't want these packets leaking into
PRE_ROUTEINGchain or have any chance to get flooded out other ports.Compile tested only...
I could use another goto instead but that becomes spaghetti and never like to jump back into a block.
[...]
net/bridge/br_input.c rx_handler_result_t br_handle_frame(stru · line 227
Quoted 5 lines
forward:
net/bridge/br_input.c +3
-0switch (p->state) { +case BR_STATE_DISABLED : +if (!ether_addr_equal (p->br->dev->dev_addr, dest)) + goto drop;
Checking against the bridge device address isn't enough, WPA EAPOL packets are addressed to the wifi device MAC address.
- Felix
Quoted 10 lines · On Fri, 11 Oct 2013 12:18:15 +0200 Felix Fietkau <[email protected]> wrote:
Quoted 9 lines · Stephen Hemminger
This is what I was thinking would be better.
Don't want these packets leaking into
PRE_ROUTEINGchain or have any chance to get flooded out other ports.Compile tested only...
I could use another goto instead but that becomes spaghetti and never like to jump back into a block.
Quoted 8 lines
[...]
net/bridge/br_input.c rx_handler_result_t br_handle_frame(stru · line 227
Quoted 5 lines
forward:
net/bridge/br_input.c +3
-0switch (p->state) { +case BR_STATE_DISABLED : +if (!ether_addr_equal (p->br->dev->dev_addr, dest)) + goto drop;Checking against the bridge device address isn't enough, WPA EAPOL packets are addressed to the wifi device MAC address.
Correct, this should be skb->dev->dev_addr which matchs against the MAC address that frame arrived on.