diff options
| author | Eric W. Biederman <ebiederm@maxwell.aristanetworks.com> | 2008-11-07 22:52:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 22:52:34 -0800 |
| commit | 5d6d480908300a0c0b3be8b58567dfcef62c83a5 (patch) | |
| tree | cf407634d239d7bf5407c576d957eca711b6b654 /net | |
| parent | 3d8160b1493bcadca74fbb635d79b3928b8999cf (diff) | |
| download | linux-stable-5d6d480908300a0c0b3be8b58567dfcef62c83a5.tar.gz linux-stable-5d6d480908300a0c0b3be8b58567dfcef62c83a5.tar.bz2 linux-stable-5d6d480908300a0c0b3be8b58567dfcef62c83a5.zip | |
net: fib_rules ordering fixes.
We need to setup the network namespace state before we register
the notifier. Otherwise if a network device is already registered
we get a nasty NULL pointer dereference.
Signed-off-by: Eric W. Biederman <ebiederm@maxwell.aristanetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/fib_rules.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 79de3b14a8d1..32b3a0152d7a 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -664,17 +664,18 @@ static int __init fib_rules_init(void) rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL); rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule); - err = register_netdevice_notifier(&fib_rules_notifier); + err = register_pernet_subsys(&fib_rules_net_ops); if (err < 0) goto fail; - err = register_pernet_subsys(&fib_rules_net_ops); + err = register_netdevice_notifier(&fib_rules_notifier); if (err < 0) goto fail_unregister; + return 0; fail_unregister: - unregister_netdevice_notifier(&fib_rules_notifier); + unregister_pernet_subsys(&fib_rules_net_ops); fail: rtnl_unregister(PF_UNSPEC, RTM_NEWRULE); rtnl_unregister(PF_UNSPEC, RTM_DELRULE); |