aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@maxwell.aristanetworks.com>2008-11-08 01:52:34 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-08 01:52:34 -0500
commit5d6d480908300a0c0b3be8b58567dfcef62c83a5 (patch)
treecf407634d239d7bf5407c576d957eca711b6b654 /net/core
parent3d8160b1493bcadca74fbb635d79b3928b8999cf (diff)
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/core')
-rw-r--r--net/core/fib_rules.c7
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)
664 rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL); 664 rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL);
665 rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule); 665 rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule);
666 666
667 err = register_netdevice_notifier(&fib_rules_notifier); 667 err = register_pernet_subsys(&fib_rules_net_ops);
668 if (err < 0) 668 if (err < 0)
669 goto fail; 669 goto fail;
670 670
671 err = register_pernet_subsys(&fib_rules_net_ops); 671 err = register_netdevice_notifier(&fib_rules_notifier);
672 if (err < 0) 672 if (err < 0)
673 goto fail_unregister; 673 goto fail_unregister;
674
674 return 0; 675 return 0;
675 676
676fail_unregister: 677fail_unregister:
677 unregister_netdevice_notifier(&fib_rules_notifier); 678 unregister_pernet_subsys(&fib_rules_net_ops);
678fail: 679fail:
679 rtnl_unregister(PF_UNSPEC, RTM_NEWRULE); 680 rtnl_unregister(PF_UNSPEC, RTM_NEWRULE);
680 rtnl_unregister(PF_UNSPEC, RTM_DELRULE); 681 rtnl_unregister(PF_UNSPEC, RTM_DELRULE);