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

This reverts commit 2a0c451ade8e1783c5d453948289e4a978d417c9.

It causes crashes, because now ip6_null_entry is used before
it is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 11 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index dc60bf585966..999a982ad3fd 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3018,13 +3018,9 @@ int __init ip6_route_init(void)
         if (ret)
                 goto out_kmem_cache;
 
-        ret = fib6_init();
-        if (ret)
-                goto out_dst_entries;
-
         ret = register_pernet_subsys(&ip6_route_net_ops);
         if (ret)
-                goto out_fib6_init;
+                goto out_dst_entries;
 
         ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep;
 
@@ -3039,13 +3035,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_late();
+        ret = fib6_init();
         if (ret)
                 goto out_register_subsys;
 
         ret = xfrm6_init();
         if (ret)
-                goto out_fib6_init_late;
+                goto out_fib6_init;
 
         ret = fib6_rules_init();
         if (ret)
@@ -3068,12 +3064,10 @@ fib6_rules_init:
         fib6_rules_cleanup();
 xfrm6_init:
         xfrm6_fini();
-out_fib6_init_late:
-        fib6_cleanup_late();
-out_register_subsys:
-        unregister_pernet_subsys(&ip6_route_net_ops);
 out_fib6_init:
         fib6_gc_cleanup();
+out_register_subsys:
+        unregister_pernet_subsys(&ip6_route_net_ops);
 out_dst_entries:
         dst_entries_destroy(&ip6_dst_blackhole_ops);
 out_kmem_cache: