evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 2a0c451ade.

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

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-06-16 01:12:19 -07:00
parent 2a0c451ade
commit e8803b6c38
3 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/ip6_fib.h
View file

@ -271,8 +271,6 @@ extern void fib6_run_gc(unsigned long expires,
extern void fib6_gc_cleanup(void); extern void fib6_gc_cleanup(void);
extern int fib6_init(void); extern int fib6_init(void);
extern int fib6_init_late(void);
extern void fib6_cleanup_late(void);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES #ifdef CONFIG_IPV6_MULTIPLE_TABLES
extern int fib6_rules_init(void); extern int fib6_rules_init(void);

18
net/ipv6/ip6_fib.c
View file

@ -1692,25 +1692,21 @@ int __init fib6_init(void)
ret = register_pernet_subsys(&fib6_net_ops); ret = register_pernet_subsys(&fib6_net_ops);
if (ret) if (ret)
goto out_kmem_cache_create; goto out_kmem_cache_create;
ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib,
NULL);
if (ret)
goto out_unregister_subsys;
out: out:
return ret; return ret;
out_unregister_subsys:
unregister_pernet_subsys(&fib6_net_ops);
out_kmem_cache_create: out_kmem_cache_create:
kmem_cache_destroy(fib6_node_kmem); kmem_cache_destroy(fib6_node_kmem);
goto out; goto out;
} }
int __init fib6_init_late(void)
{
return __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib,
NULL);
}
void fib6_cleanup_late(void)
{
rtnl_unregister(PF_INET6, RTM_GETROUTE);
}
void fib6_gc_cleanup(void) void fib6_gc_cleanup(void)
{ {
unregister_pernet_subsys(&fib6_net_ops); unregister_pernet_subsys(&fib6_net_ops);

16
net/ipv6/route.c
View file

@ -3018,13 +3018,9 @@ int __init ip6_route_init(void)
if (ret) if (ret)
goto out_kmem_cache; goto out_kmem_cache;
ret = fib6_init();
if (ret)
goto out_dst_entries;
ret = register_pernet_subsys(&ip6_route_net_ops); ret = register_pernet_subsys(&ip6_route_net_ops);
if (ret) if (ret)
goto out_fib6_init; goto out_dst_entries;
ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops_template.kmem_cachep; 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->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
#endif #endif
ret = fib6_init_late(); ret = fib6_init();
if (ret) if (ret)
goto out_register_subsys; goto out_register_subsys;
ret = xfrm6_init(); ret = xfrm6_init();
if (ret) if (ret)
goto out_fib6_init_late; goto out_fib6_init;
ret = fib6_rules_init(); ret = fib6_rules_init();
if (ret) if (ret)
@ -3068,12 +3064,10 @@ fib6_rules_init:
fib6_rules_cleanup(); fib6_rules_cleanup();
xfrm6_init: xfrm6_init:
xfrm6_fini(); xfrm6_fini();
out_fib6_init_late:
fib6_cleanup_late();
out_register_subsys:
unregister_pernet_subsys(&ip6_route_net_ops);
out_fib6_init: out_fib6_init:
fib6_gc_cleanup(); fib6_gc_cleanup();
out_register_subsys:
unregister_pernet_subsys(&ip6_route_net_ops);
out_dst_entries: out_dst_entries:
dst_entries_destroy(&ip6_dst_blackhole_ops); dst_entries_destroy(&ip6_dst_blackhole_ops);
out_kmem_cache: out_kmem_cache: