bridge: allow local delivery when port is disabled
Subsystems (3)
PATCH 1/1 bridge: allow local delivery when port is disabled
When an Ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet reception 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.
In this special case, packets are not forwarded (local delivery only), and only packet directed at the address of the Ethernet device are accepted (no promiscuous or other ports in bridge).
The existing code already allowed link-local-address packets in which is what STP uses to communicate with other bridges.
--- net/bridge/br_input.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
net/bridge/br_input.c +19 -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,14 +216,8 @@ 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:
@@ -235,6 +239,13 @@ forward:NF_HOOK (NFPROTO_BRIDGE ,NF_BR_PRE_ROUTING , skb, skb->dev,NULL , br_handle_frame_finish);break ; + +case BR_STATE_DISABLED : +if (skb->pkt_type ==PACKET_HOST ) { + *pskb = skb; +return br_local_only (skb); + } +/* fall through */ default : drop:kfree_skb (skb);
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Thu, 12 Dec 2013 13:41:59 -0800
Quoted 13 lines
When an Ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet reception 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.
In this special case, packets are not forwarded (local delivery only), and only packet directed at the address of the Ethernet device are accepted (no promiscuous or other ports in bridge).
Quoted 5 lines
The existing code already allowed link-local-address packets in which is what STP uses to communicate with other bridges.
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>
I think this change needs to be more careful about the setting of *pskb. It should not be assigned if we return RX_HANDLER_CONSUMED.
Quoted 16 lines · On Thu, 12 Dec 2013 17:26:37 -0500 (EST) David Miller <[email protected]>…
From: Stephen Hemminger <[email protected]>
Date: Thu, 12 Dec 2013 13:41:59 -0800Quoted 13 lines
When an Ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet reception 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.
In this special case, packets are not forwarded (local delivery only), and only packet directed at the address of the Ethernet device are accepted (no promiscuous or other ports in bridge).
Quoted 8 lines
Quoted 5 lines
The existing code already allowed link-local-address packets in which is what STP uses to communicate with other bridges.
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>I think this change needs to be more careful about the setting of *pskb. It should not be assigned if we return
RX_HANDLER_CONSUMED.
It was already in the existing code path for link local.
David Miller
maintainerFrom: Stephen Hemminger <[email protected]>
Date: Thu, 12 Dec 2013 15:05:23 -0800
Quoted 22 lines
Quoted 19 lines · On Thu, 12 Dec 2013 17:26:37 -0500 (EST) David Miller <[email protected]>…
From: Stephen Hemminger <[email protected]>
Date: Thu, 12 Dec 2013 13:41:59 -0800Quoted 16 lines
When an Ethernet device is enslaved to a bridge, and the bridge STP detects loss of carrier (or operational state down), then normally packet reception 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.
In this special case, packets are not forwarded (local delivery only), and only packet directed at the address of the Ethernet device are accepted (no promiscuous or other ports in bridge).
The existing code already allowed link-local-address packets in which is what STP uses to communicate with other bridges.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Felix Fietkau <[email protected]>I think this change needs to be more careful about the setting of *pskb. It should not be assigned if we return
RX_HANDLER_CONSUMED.It was already in the existing code path for link local.
That's not true, the "*pskb = skb;" assignment was only done when the code retuned RX_HANDLER_PASS. You are changing it to unconditionally make this assignment.