netfilter: ebtables: make broute table work again
authorFlorian Westphal <fw@strlen.de>
Tue, 11 Jan 2011 22:55:51 +0000 (23:55 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 11 Jan 2011 22:55:51 +0000 (23:55 +0100)
broute table init hook sets up the "br_should_route_hook" pointer,
which then gets called from br_input.

commit a386f99025f13b32502fe5dedf223c20d7283826
(bridge: add proper RCU annotation to should_route_hook)
introduced a typedef, and then changed this to:

br_should_route_hook_t *rhook;
[..]
rhook = rcu_dereference(br_should_route_hook);
if (*rhook(skb))

problem is that "br_should_route_hook" contains the address of the function,
so calling *rhook() results in kernel panic.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/linux/if_bridge.h

index f7e73c338c40f630f5b0e9bf204c3ab82f00c356..dd3f201396407dc7f4cac0c15452278c850ba261 100644 (file)
@@ -103,7 +103,7 @@ struct __fdb_entry {
 
 extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
 
-typedef int (*br_should_route_hook_t)(struct sk_buff *skb);
+typedef int br_should_route_hook_t(struct sk_buff *skb);
 extern br_should_route_hook_t __rcu *br_should_route_hook;
 
 #endif