--- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit int br_forward_finish(struct sk_buff *skb) { - return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev, + return BR_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev, br_dev_queue_push_xmit); } @@ -77,7 +77,7 @@ static void __br_deliver(const struct ne return; } - NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, + BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, br_forward_finish); } @@ -98,7 +98,7 @@ static void __br_forward(const struct ne skb->dev = to->dev; skb_forward_csum(skb); - NF_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev, + BR_HOOK(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev, br_forward_finish); } --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -53,7 +53,7 @@ static int br_pass_frame_up(struct sk_bu if (!skb) return NET_RX_DROP; - return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, + return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, netif_receive_skb); } @@ -219,7 +219,7 @@ rx_handler_result_t br_handle_frame(stru } /* Deliver packet to local host only */ - if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, + if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, NULL, br_handle_local_finish)) { return RX_HANDLER_CONSUMED; /* consumed by filter */ } else { @@ -234,7 +234,7 @@ forward: 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, + if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, br_handle_local_finish)) break; @@ -256,7 +256,7 @@ forward: if (ether_addr_equal(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; - NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, + BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, br_handle_frame_finish); break; default: --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -815,7 +815,7 @@ static void __br_multicast_send_query(st if (port) { __skb_push(skb, sizeof(struct ethhdr)); skb->dev = port->dev; - NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, + BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, dev_queue_xmit); } else { br_multicast_select_own_querier(br, ip, skb); --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -73,6 +73,15 @@ static int brnf_pass_vlan_indev __read_m #define IS_ARP(skb) \ (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_ARP)) +int brnf_call_ebtables __read_mostly = 0; +EXPORT_SYMBOL_GPL(brnf_call_ebtables); + +bool br_netfilter_run_hooks(void) +{ + return brnf_call_iptables | brnf_call_ip6tables | brnf_call_arptables | + brnf_call_ebtables; +} + static inline __be16 vlan_proto(const struct sk_buff *skb) { if (vlan_tx_tag_present(skb)) --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -769,15 +769,29 @@ static inline int br_vlan_enabled(struct /* br_netfilter.c */ #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) +extern int brnf_call_ebtables; int br_nf_core_init(void); void br_nf_core_fini(void); void br_netfilter_rtable_init(struct net_bridge *); +bool br_netfilter_run_hooks(void); #else static inline int br_nf_core_init(void) { return 0; } static inline void br_nf_core_fini(void) {} #define br_netfilter_rtable_init(x) +#define br_netfilter_run_hooks() false #endif +static inline int +BR_HOOK(uint8_t pf, unsigned int hook, struct sk_buff *skb, + struct net_device *in, struct net_device *out, + int (*okfn)(struct sk_buff *)) +{ + if (!br_netfilter_run_hooks()) + return okfn(skb); + + return NF_HOOK(pf, hook, skb, in, out, okfn); +} + /* br_stp.c */ void br_log_state(const struct net_bridge_port *p); void br_set_state(struct net_bridge_port *p, unsigned int state); --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -54,7 +54,7 @@ static void br_send_bpdu(struct net_brid skb_reset_mac_header(skb); - NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, + BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev, dev_queue_xmit); } --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -2414,11 +2414,13 @@ static int __init ebtables_init(void) } printk(KERN_INFO "Ebtables v2.0 registered\n"); + brnf_call_ebtables = 1; return 0; } static void __exit ebtables_fini(void) { + brnf_call_ebtables = 0; nf_unregister_sockopt(&ebt_sockopts); xt_unregister_target(&ebt_standard_target); printk(KERN_INFO "Ebtables v2.0 unregistered\n");