Commit 5d6d4809 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller

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: default avatarEric W. Biederman <ebiederm@maxwell.aristanetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d8160b1
...@@ -664,17 +664,18 @@ static int __init fib_rules_init(void) ...@@ -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_DELRULE, fib_nl_delrule, NULL);
rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule); 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) if (err < 0)
goto fail; goto fail;
err = register_pernet_subsys(&fib_rules_net_ops); err = register_netdevice_notifier(&fib_rules_notifier);
if (err < 0) if (err < 0)
goto fail_unregister; goto fail_unregister;
return 0; return 0;
fail_unregister: fail_unregister:
unregister_netdevice_notifier(&fib_rules_notifier); unregister_pernet_subsys(&fib_rules_net_ops);
fail: fail:
rtnl_unregister(PF_UNSPEC, RTM_NEWRULE); rtnl_unregister(PF_UNSPEC, RTM_NEWRULE);
rtnl_unregister(PF_UNSPEC, RTM_DELRULE); rtnl_unregister(PF_UNSPEC, RTM_DELRULE);
......
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