ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ipv6_route

[karo-tx-linux.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 999a982ad3fd7d7abac40211b50320fc4c038109..dc60bf5859666c6b5e0d0c9a89024879870bad94 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3018,10 +3018,14 @@ int __init ip6_route_init(void)
        if (ret)
                goto out_kmem_cache;
 
-       ret = register_pernet_subsys(&ip6_route_net_ops);
+       ret = fib6_init();
        if (ret)
                goto out_dst_entries;
 
+       ret = register_pernet_subsys(&ip6_route_net_ops);
+       if (ret)
+               goto out_fib6_init;
+
        ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep;
 
        /* Registering of the loopback is done before this portion of code,
@@ -3035,13 +3039,13 @@ int __init ip6_route_init(void)
        init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
        init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
   #endif
-       ret = fib6_init();
+       ret = fib6_init_late();
        if (ret)
                goto out_register_subsys;
 
        ret = xfrm6_init();
        if (ret)
-               goto out_fib6_init;
+               goto out_fib6_init_late;
 
        ret = fib6_rules_init();
        if (ret)
@@ -3064,10 +3068,12 @@ fib6_rules_init:
        fib6_rules_cleanup();
 xfrm6_init:
        xfrm6_fini();
-out_fib6_init:
-       fib6_gc_cleanup();
+out_fib6_init_late:
+       fib6_cleanup_late();
 out_register_subsys:
        unregister_pernet_subsys(&ip6_route_net_ops);
+out_fib6_init:
+       fib6_gc_cleanup();
 out_dst_entries:
        dst_entries_destroy(&ip6_dst_blackhole_ops);
 out_kmem_cache: