diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-13 12:57:24 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-14 10:32:01 -0800 |
commit | efdd016aec960e4b4ace07cb77c36e98caa296f4 (patch) | |
tree | 69526d1048fa8f370a026bac9e9fe9e0fc75257d /net/bridge/netfilter/ebtable_broute.c | |
parent | 2370eae7567e06b10f68ce293cb2a6b4f773b0c7 (diff) |
BRIDGE: Properly dereference the br_should_route_hook
[BRIDGE]: Properly dereference the br_should_route_hook
[ Upstream commit: 82de382ce8e1c7645984616728dc7aaa057821e4 ]
This hook is protected with the RCU, so simple
if (br_should_route_hook)
br_should_route_hook(...)
is not enough on some architectures.
Use the rcu_dereference/rcu_assign_pointer in this case.
Fixed Stephen's comment concerning using the typeof().
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/bridge/netfilter/ebtable_broute.c')
-rw-r--r-- | net/bridge/netfilter/ebtable_broute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c index d37ce0478938..bc17cf529802 100644 --- a/net/bridge/netfilter/ebtable_broute.c +++ b/net/bridge/netfilter/ebtable_broute.c @@ -70,13 +70,13 @@ static int __init ebtable_broute_init(void) if (ret < 0) return ret; /* see br_input.c */ - br_should_route_hook = ebt_broute; + rcu_assign_pointer(br_should_route_hook, ebt_broute); return ret; } static void __exit ebtable_broute_fini(void) { - br_should_route_hook = NULL; + rcu_assign_pointer(br_should_route_hook, NULL); synchronize_net(); ebt_unregister_table(&broute_table); } |