bridge: br_handle_local_finish should not return zero
Subsystems (3)
PATCH 1/1 bridge: br_handle_local_finish should not return zero
br_handle_local_finish is called by NF_HOOK(...) after accepting the packet. If the return value of NF_HOOK(...) is zero (i.e. the return value of br_handle_local_finish), the packet is passed to the network stack. This behavior conflicts with netfilter hooks which return NF_STOLEN/NF_QUEUE. In this case, NF_HOOK(...) returns also zero (see nf_hook_slow) but br_handle_local_finish was never called. The packet will still passed to the network stack.
net/bridge/br_input.c +2 -2
@@ -149,7 +149,7 @@ static int br_handle_local_finish(struct sk_buff *skb)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 */ +return 1 ;/* process further */ }/*
@@ -208,7 +208,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)/* Deliver packet to local host only */ if (NF_HOOK (NFPROTO_BRIDGE ,NF_BR_LOCAL_IN , skb, skb->dev, -NULL , br_handle_local_finish)) { +NULL , br_handle_local_finish) !=1 ) {return RX_HANDLER_CONSUMED ;/* consumed by filter */ }else { *pskb = skb;
David Miller
maintainerFrom: Martin Faecknitz <[email protected]>
Date: Sat, 14 Dec 2013 21:52:08 +0100
Quoted 9 lines
br_handle_local_finishis called byNF_HOOK(...)after accepting the packet. If the return value ofNF_HOOK(...)is zero (i.e. the return value ofbr_handle_local_finish), the packet is passed to the network stack. This behavior conflicts with netfilter hooks which return NF_STOLEN/NF_QUEUE. In this case,NF_HOOK(...)returns also zero (seenf_hook_slow) butbr_handle_local_finishwas never called. The packet will still passed to the network stack.Signed-off-by Martin Faecknitz
This is not a proper Signed-off-by: tag, you have to put your name as well as your email address, similar to how it appears in the "From: " field of your outgoing emails.
Quoted 31 lines · On Sat, 14 Dec 2013 21:52:08 +0100 Martin Faecknitz <[email protected]>…
br_handle_local_finishis called byNF_HOOK(...)after accepting the packet. If the return value ofNF_HOOK(...)is zero (i.e. the return value ofbr_handle_local_finish), the packet is passed to the network stack. This behavior conflicts with netfilter hooks which return NF_STOLEN/NF_QUEUE. In this case,NF_HOOK(...)returns also zero (seenf_hook_slow) butbr_handle_local_finishwas never called. The packet will still passed to the network stack.Signed-off-by Martin Faecknitznet/bridge/br_input.c +2
-3@@ -149,7 +149,7 @@ static int br_handle_local_finish(struct sk_buff *skb)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 */ +return 1 ;/* process further */ }/* @@ -208,7 +208,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)/* Deliver packet to local host only */ if (NF_HOOK (NFPROTO_BRIDGE ,NF_BR_LOCAL_IN , skb, skb->dev, -NULL , br_handle_local_finish)) { +NULL , br_handle_local_finish) !=1 ) {return RX_HANDLER_CONSUMED ;/* consumed by filter */ }else { *pskb = skb; --
Quoted 3 lines
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
I think the input code was incorrectly assuming the model of that receive logic should return NET_RX_SUCCESS(0) or NET_RX_DROP(1). (Note DECNET has same bug).
Rather than hardcode in 0 and 1. why not use NF_DROP, NF_ACCEPT instead?