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

Commit 0c96d8c5 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by David S. Miller
Browse files

[NETNS][IPV6] udp6 - make proc per namespace 



The proc init/exit functions take a new network namespace parameter in
order to register/unregister /proc/net/udp6 for a namespace.

Signed-off-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f40c8174

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -597,8 +597,8 @@ extern int raw6_proc_init(void); 
extern void raw6_proc_exit(void);

extern int  tcp6_proc_init(void);

extern void tcp6_proc_exit(void);

extern int  udp6_proc_init(void);

extern void udp6_proc_exit(void);

extern int  udp6_proc_init(struct net *net);

extern void udp6_proc_exit(struct net *net);

extern int  udplite6_proc_init(void);

extern void udplite6_proc_exit(void);

extern int  ipv6_misc_proc_init(void);

include/net/udp.h

+2 −2
Original line number Diff line number Diff line
@@ -200,8 +200,8 @@ struct udp_iter_state { 
};



#ifdef CONFIG_PROC_FS

extern int udp_proc_register(struct udp_seq_afinfo *afinfo);

extern void udp_proc_unregister(struct udp_seq_afinfo *afinfo);

extern int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo);

extern void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo);



extern int  udp4_proc_init(void);

extern void udp4_proc_exit(void);

net/ipv4/udp.c

+6 −6
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ static int udp_seq_release(struct inode *inode, struct file *file) 
}



/* ------------------------------------------------------------------------ */

int udp_proc_register(struct udp_seq_afinfo *afinfo)

int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)

{

	struct proc_dir_entry *p;

	int rc = 0;
@@ -1645,7 +1645,7 @@ int udp_proc_register(struct udp_seq_afinfo *afinfo) 
	afinfo->seq_fops->llseek	= seq_lseek;

	afinfo->seq_fops->release	= udp_seq_release;



	p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops);

	p = proc_net_fops_create(net, afinfo->name, S_IRUGO, afinfo->seq_fops);

	if (p)

		p->data = afinfo;

	else
@@ -1653,11 +1653,11 @@ int udp_proc_register(struct udp_seq_afinfo *afinfo) 
	return rc;

}



void udp_proc_unregister(struct udp_seq_afinfo *afinfo)

void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo)

{

	if (!afinfo)

		return;

	proc_net_remove(&init_net, afinfo->name);

	proc_net_remove(net, afinfo->name);

	memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));

}
@@ -1709,12 +1709,12 @@ static struct udp_seq_afinfo udp4_seq_afinfo = { 


int __init udp4_proc_init(void)

{

	return udp_proc_register(&udp4_seq_afinfo);

	return udp_proc_register(&init_net, &udp4_seq_afinfo);

}



void udp4_proc_exit(void)

{

	udp_proc_unregister(&udp4_seq_afinfo);

	udp_proc_unregister(&init_net, &udp4_seq_afinfo);

}

#endif /* CONFIG_PROC_FS */

net/ipv4/udplite.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void __init udplite4_register(void) 
	inet_register_protosw(&udplite4_protosw);



#ifdef CONFIG_PROC_FS

	if (udp_proc_register(&udplite4_seq_afinfo)) /* udplite4_proc_init() */

	if (udp_proc_register(&init_net, &udplite4_seq_afinfo))

		printk(KERN_ERR "%s: Cannot register /proc!\n", __func__);

#endif

	return;

net/ipv6/af_inet6.c

+12 −7
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ static void cleanup_ipv6_mibs(void) 


static int inet6_net_init(struct net *net)

{

	int err = 0;



	net->ipv6.sysctl.bindv6only = 0;

	net->ipv6.sysctl.flush_delay = 0;

	net->ipv6.sysctl.ip6_rt_max_size = 4096;
@@ -853,12 +855,20 @@ static int inet6_net_init(struct net *net) 
	net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;

	net->ipv6.sysctl.icmpv6_time = 1*HZ;



	return 0;

#ifdef CONFIG_PROC_FS

	err = udp6_proc_init(net);

	if (err)

		goto out;

out:

#endif

	return err;

}



static void inet6_net_exit(struct net *net)

{

	return;

#ifdef CONFIG_PROC_FS

	udp6_proc_exit(net);

#endif

}



static struct pernet_operations inet6_net_ops = {
@@ -943,8 +953,6 @@ static int __init inet6_init(void) 
		goto proc_raw6_fail;

	if (tcp6_proc_init())

		goto proc_tcp6_fail;

	if (udp6_proc_init())

		goto proc_udp6_fail;

	if (udplite6_proc_init())

		goto proc_udplite6_fail;

	if (ipv6_misc_proc_init())
@@ -1029,8 +1037,6 @@ static int __init inet6_init(void) 
proc_misc6_fail:

	udplite6_proc_exit();

proc_udplite6_fail:

	udp6_proc_exit();

proc_udp6_fail:

	tcp6_proc_exit();

proc_tcp6_fail:

	raw6_proc_exit();
@@ -1092,7 +1098,6 @@ static void __exit inet6_exit(void) 
	ac6_proc_exit();

	ipv6_misc_proc_exit();

	udplite6_proc_exit();

	udp6_proc_exit();

	tcp6_proc_exit();

	raw6_proc_exit();

#endif