mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
ipv6: don't call fib6_run_gc() until routing is ready
When loading the ipv6 module, ndisc_init() is called before ip6_route_init(). As the former registers a handler calling fib6_run_gc(), this opens a window to run the garbage collector before necessary data structures are initialized. If a network device is initialized in this window, adding MAC address to it triggers a NETDEV_CHANGEADDR event, leading to a crash in fib6_clean_all(). Take the event handler registration out of ndisc_init() into a separate function ndisc_late_init() and move it after ip6_route_init(). Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
444fa88ac3
commit
2c861cc65e
3 changed files with 19 additions and 7 deletions
|
@ -190,7 +190,9 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, cons
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int ndisc_init(void);
|
extern int ndisc_init(void);
|
||||||
|
extern int ndisc_late_init(void);
|
||||||
|
|
||||||
|
extern void ndisc_late_cleanup(void);
|
||||||
extern void ndisc_cleanup(void);
|
extern void ndisc_cleanup(void);
|
||||||
|
|
||||||
extern int ndisc_rcv(struct sk_buff *skb);
|
extern int ndisc_rcv(struct sk_buff *skb);
|
||||||
|
|
|
@ -915,6 +915,9 @@ static int __init inet6_init(void)
|
||||||
err = ip6_route_init();
|
err = ip6_route_init();
|
||||||
if (err)
|
if (err)
|
||||||
goto ip6_route_fail;
|
goto ip6_route_fail;
|
||||||
|
err = ndisc_late_init();
|
||||||
|
if (err)
|
||||||
|
goto ndisc_late_fail;
|
||||||
err = ip6_flowlabel_init();
|
err = ip6_flowlabel_init();
|
||||||
if (err)
|
if (err)
|
||||||
goto ip6_flowlabel_fail;
|
goto ip6_flowlabel_fail;
|
||||||
|
@ -981,6 +984,8 @@ ipv6_exthdrs_fail:
|
||||||
addrconf_fail:
|
addrconf_fail:
|
||||||
ip6_flowlabel_cleanup();
|
ip6_flowlabel_cleanup();
|
||||||
ip6_flowlabel_fail:
|
ip6_flowlabel_fail:
|
||||||
|
ndisc_late_cleanup();
|
||||||
|
ndisc_late_fail:
|
||||||
ip6_route_cleanup();
|
ip6_route_cleanup();
|
||||||
ip6_route_fail:
|
ip6_route_fail:
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
|
@ -1043,6 +1048,7 @@ static void __exit inet6_exit(void)
|
||||||
ipv6_exthdrs_exit();
|
ipv6_exthdrs_exit();
|
||||||
addrconf_cleanup();
|
addrconf_cleanup();
|
||||||
ip6_flowlabel_cleanup();
|
ip6_flowlabel_cleanup();
|
||||||
|
ndisc_late_cleanup();
|
||||||
ip6_route_cleanup();
|
ip6_route_cleanup();
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
|
|
||||||
|
|
|
@ -1727,24 +1727,28 @@ int __init ndisc_init(void)
|
||||||
if (err)
|
if (err)
|
||||||
goto out_unregister_pernet;
|
goto out_unregister_pernet;
|
||||||
#endif
|
#endif
|
||||||
err = register_netdevice_notifier(&ndisc_netdev_notifier);
|
|
||||||
if (err)
|
|
||||||
goto out_unregister_sysctl;
|
|
||||||
out:
|
out:
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
out_unregister_sysctl:
|
|
||||||
#ifdef CONFIG_SYSCTL
|
#ifdef CONFIG_SYSCTL
|
||||||
neigh_sysctl_unregister(&nd_tbl.parms);
|
|
||||||
out_unregister_pernet:
|
out_unregister_pernet:
|
||||||
#endif
|
|
||||||
unregister_pernet_subsys(&ndisc_net_ops);
|
unregister_pernet_subsys(&ndisc_net_ops);
|
||||||
goto out;
|
goto out;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
int __init ndisc_late_init(void)
|
||||||
|
{
|
||||||
|
return register_netdevice_notifier(&ndisc_netdev_notifier);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ndisc_late_cleanup(void)
|
||||||
|
{
|
||||||
|
unregister_netdevice_notifier(&ndisc_netdev_notifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ndisc_cleanup(void)
|
void ndisc_cleanup(void)
|
||||||
{
|
{
|
||||||
unregister_netdevice_notifier(&ndisc_netdev_notifier);
|
|
||||||
#ifdef CONFIG_SYSCTL
|
#ifdef CONFIG_SYSCTL
|
||||||
neigh_sysctl_unregister(&nd_tbl.parms);
|
neigh_sysctl_unregister(&nd_tbl.parms);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue