AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[NETNS][IPV6]: inet6_addr - isolate inet6 addresses from proc file

Browse Source 
Make /proc/net/if_inet6 show only inet6 addresses belonging to the
namespace.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Lezcano 2008-01-10 22:42:49 -08:00 committed by David S. Miller
parent 39971554d3
commit 3c40090a0f
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
net/ipv6/addrconf.c
View File

@ -2736,6 +2736,7 @@ static void addrconf_dad_run(struct inet6_dev *idev) {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
struct if6_iter_state { struct if6_iter_state {
struct seq_net_private p;
int bucket; int bucket;
}; };
@ -2743,9 +2744,13 @@ static struct inet6_ifaddr *if6_get_first(struct seq_file *seq)
{ {
struct inet6_ifaddr *ifa = NULL; struct inet6_ifaddr *ifa = NULL;
struct if6_iter_state *state = seq->private; struct if6_iter_state *state = seq->private;
struct net *net = state->p.net;
for (state->bucket = 0; state->bucket < IN6_ADDR_HSIZE; ++state->bucket) { for (state->bucket = 0; state->bucket < IN6_ADDR_HSIZE; ++state->bucket) {
ifa = inet6_addr_lst[state->bucket]; ifa = inet6_addr_lst[state->bucket];
while (ifa && ifa->idev->dev->nd_net != net)
ifa = ifa->lst_next;
if (ifa) if (ifa)
break; break;
} }
@ -2755,13 +2760,22 @@ static struct inet6_ifaddr *if6_get_first(struct seq_file *seq)
static struct inet6_ifaddr *if6_get_next(struct seq_file *seq, struct inet6_ifaddr *ifa) static struct inet6_ifaddr *if6_get_next(struct seq_file *seq, struct inet6_ifaddr *ifa)
{ {
struct if6_iter_state *state = seq->private; struct if6_iter_state *state = seq->private;
struct net *net = state->p.net;
ifa = ifa->lst_next; ifa = ifa->lst_next;
try_again: try_again:
if (ifa) {
if (ifa->idev->dev->nd_net != net) {
ifa = ifa->lst_next;
goto try_again;
}
}
if (!ifa && ++state->bucket < IN6_ADDR_HSIZE) { if (!ifa && ++state->bucket < IN6_ADDR_HSIZE) {
ifa = inet6_addr_lst[state->bucket]; ifa = inet6_addr_lst[state->bucket];
goto try_again; goto try_again;
} }
return ifa; return ifa;
} }
@ -2818,7 +2832,7 @@ static const struct seq_operations if6_seq_ops = {
static int if6_seq_open(struct inode *inode, struct file *file) static int if6_seq_open(struct inode *inode, struct file *file)
{ {
return seq_open_private(file, &if6_seq_ops, return seq_open_net(inode, file, &if6_seq_ops,
sizeof(struct if6_iter_state)); sizeof(struct if6_iter_state));
} }
@ -2827,19 +2841,34 @@ static const struct file_operations if6_fops = {
.open = if6_seq_open, .open = if6_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_private, .release = seq_release_net,
}; };
int __init if6_proc_init(void) static int if6_proc_net_init(struct net *net)
{ {
if (!proc_net_fops_create(&init_net, "if_inet6", S_IRUGO, &if6_fops)) if (!proc_net_fops_create(net, "if_inet6", S_IRUGO, &if6_fops))
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
static void if6_proc_net_exit(struct net *net)
{
proc_net_remove(net, "if_inet6");
}
static struct pernet_operations if6_proc_net_ops = {
.init = if6_proc_net_init,
.exit = if6_proc_net_exit,
};
int __init if6_proc_init(void)
{
return register_pernet_subsys(&if6_proc_net_ops);
}
void if6_proc_exit(void) void if6_proc_exit(void)
{ {
proc_net_remove(&init_net, "if_inet6"); unregister_pernet_subsys(&if6_proc_net_ops);
} }
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */