Commit a13b2082 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller

bridge: drop netfilter fake rtable unconditionally

Andreas reports kernel oops during rmmod of the br_netfilter module.
Hannes debugged the oops down to a NULL rt6info->rt6i_indev.

Problem is that br_netfilter has the nasty concept of adding a fake
rtable to skb->dst; this happens in a br_netfilter prerouting hook.

A second hook (in bridge LOCAL_IN) is supposed to remove these again
before the skb is handed up the stack.

However, on module unload hooks get unregistered which means an
skb could traverse the prerouting hook that attaches the fake_rtable,
while the 'fake rtable remove' hook gets removed from the hooklist
immediately after.

Fixes: 34666d46 ("netfilter: bridge: move br_netfilter out of the core")
Reported-by: default avatarAndreas Karis <akaris@redhat.com>
Debugged-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79e49503
...@@ -30,6 +30,7 @@ EXPORT_SYMBOL(br_should_route_hook); ...@@ -30,6 +30,7 @@ EXPORT_SYMBOL(br_should_route_hook);
static int static int
br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb) br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)
{ {
br_drop_fake_rtable(skb);
return netif_receive_skb(skb); return netif_receive_skb(skb);
} }
......
...@@ -521,21 +521,6 @@ static unsigned int br_nf_pre_routing(void *priv, ...@@ -521,21 +521,6 @@ static unsigned int br_nf_pre_routing(void *priv,
} }
/* PF_BRIDGE/LOCAL_IN ************************************************/
/* The packet is locally destined, which requires a real
* dst_entry, so detach the fake one. On the way up, the
* packet would pass through PRE_ROUTING again (which already
* took place when the packet entered the bridge), but we
* register an IPv4 PRE_ROUTING 'sabotage' hook that will
* prevent this from happening. */
static unsigned int br_nf_local_in(void *priv,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
br_drop_fake_rtable(skb);
return NF_ACCEPT;
}
/* PF_BRIDGE/FORWARD *************************************************/ /* PF_BRIDGE/FORWARD *************************************************/
static int br_nf_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb) static int br_nf_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{ {
...@@ -907,12 +892,6 @@ static struct nf_hook_ops br_nf_ops[] __read_mostly = { ...@@ -907,12 +892,6 @@ static struct nf_hook_ops br_nf_ops[] __read_mostly = {
.hooknum = NF_BR_PRE_ROUTING, .hooknum = NF_BR_PRE_ROUTING,
.priority = NF_BR_PRI_BRNF, .priority = NF_BR_PRI_BRNF,
}, },
{
.hook = br_nf_local_in,
.pf = NFPROTO_BRIDGE,
.hooknum = NF_BR_LOCAL_IN,
.priority = NF_BR_PRI_BRNF,
},
{ {
.hook = br_nf_forward_ip, .hook = br_nf_forward_ip,
.pf = NFPROTO_BRIDGE, .pf = NFPROTO_BRIDGE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment