Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f9f489a authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

net: missing bits of net-namespace / sysctl 



Piss-poor sysctl registration API strikes again, film at 11...
What we really need is _pathname_ required to be present in
already registered table, so that kernel could warn about bad
order.  That's the next target for sysctl stuff (and generally
saner and more explicit order of initialization of ipv[46]
internals wouldn't hurt either).

For the time being, here are full fixups required by ..._rotable()
stuff; we make per-net sysctl sets descendents of "ro" one and
make sure that sufficient skeleton is there before we start registering
per-net sysctls.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15d3b4a2

include/net/ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -608,6 +608,8 @@ extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net); 
extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);

extern int ipv6_sysctl_register(void);

extern void ipv6_sysctl_unregister(void);

extern int ipv6_static_sysctl_register(void);

extern void ipv6_static_sysctl_unregister(void);

#endif



#endif /* __KERNEL__ */

include/net/route.h

+0 −2
Original line number Diff line number Diff line
@@ -204,6 +204,4 @@ static inline struct inet_peer *rt_get_peer(struct rtable *rt) 
	return rt->peer;

}



extern ctl_table ipv4_route_table[];



#endif	/* _ROUTE_H */

net/ipv4/route.c

+10 −1
Original line number Diff line number Diff line
@@ -2914,7 +2914,7 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table, 
	return 0;

}



ctl_table ipv4_route_table[] = {

static ctl_table ipv4_route_table[] = {

	{

		.ctl_name	= NET_IPV4_ROUTE_GC_THRESH,

		.procname	= "gc_thresh",
@@ -3216,6 +3216,15 @@ int __init ip_rt_init(void) 
	return rc;

}



/*

 * We really need to sanitize the damn ipv4 init order, then all

 * this nonsense will go away.

 */

void __init ip_static_sysctl_init(void)

{

	register_sysctl_paths(ipv4_route_path, ipv4_route_table);

}



EXPORT_SYMBOL(__ip_select_ident);

EXPORT_SYMBOL(ip_route_input);

EXPORT_SYMBOL(ip_route_output_key);

net/ipv4/sysctl_net_ipv4.c

+0 −14
Original line number Diff line number Diff line
@@ -401,13 +401,6 @@ static struct ctl_table ipv4_table[] = { 
		.proc_handler	= &ipv4_local_port_range,

		.strategy	= &ipv4_sysctl_local_port_range,

	},

	{

		.ctl_name	= NET_IPV4_ROUTE,

		.procname	= "route",

		.maxlen		= 0,

		.mode		= 0555,

		.child		= ipv4_route_table

	},

#ifdef CONFIG_IP_MULTICAST

	{

		.ctl_name	= NET_IPV4_IGMP_MAX_MEMBERSHIPS,
@@ -882,11 +875,4 @@ static __init int sysctl_ipv4_init(void) 
	return 0;

}



/* set enough of tree skeleton to get rid of ordering problems */

void __init ip_static_sysctl_init(void)

{

	static ctl_table table[1];

	register_sysctl_paths(net_ipv4_ctl_path, table);

}



__initcall(sysctl_ipv4_init);

net/ipv6/af_inet6.c

+12 −0
Original line number Diff line number Diff line
@@ -934,6 +934,11 @@ static int __init inet6_init(void) 
	if (err)

		goto out_unregister_sock;



#ifdef CONFIG_SYSCTL

	err = ipv6_static_sysctl_register();

	if (err)

		goto static_sysctl_fail;

#endif

	/*

	 *	ipngwg API draft makes clear that the correct semantics

	 *	for TCP and UDP is to consider one TCP and UDP instance
@@ -1058,6 +1063,10 @@ ipmr_fail: 
icmp_fail:

	unregister_pernet_subsys(&inet6_net_ops);

register_pernet_fail:

#ifdef CONFIG_SYSCTL

	ipv6_static_sysctl_unregister();

static_sysctl_fail:

#endif

	cleanup_ipv6_mibs();

out_unregister_sock:

	sock_unregister(PF_INET6);
@@ -1113,6 +1122,9 @@ static void __exit inet6_exit(void) 
	rawv6_exit();



	unregister_pernet_subsys(&inet6_net_ops);

#ifdef CONFIG_SYSCTL

	ipv6_static_sysctl_unregister();

#endif

	cleanup_ipv6_mibs();

	proto_unregister(&rawv6_prot);

	proto_unregister(&udplitev6_prot);