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

Commit 5983a3df authored by Benjamin Thery's avatar Benjamin Thery Committed by David S. Miller
Browse files

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



Make /proc/net/ip6_flowlabel show only flow labels belonging to the
current network namespace.

Signed-off-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60e8fbc4
Loading
Loading
Loading
Loading
+23 −16
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
#ifdef CONFIG_PROC_FS

struct ip6fl_iter_state {
	struct seq_net_private p;
	int bucket;
};

@@ -620,25 +621,34 @@ static struct ip6_flowlabel *ip6fl_get_first(struct seq_file *seq)
{
	struct ip6_flowlabel *fl = NULL;
	struct ip6fl_iter_state *state = ip6fl_seq_private(seq);
	struct net *net = seq_file_net(seq);

	for (state->bucket = 0; state->bucket <= FL_HASH_MASK; ++state->bucket) {
		if (fl_ht[state->bucket]) {
		fl = fl_ht[state->bucket];

		while (fl && fl->fl_net != net)
			fl = fl->next;
		if (fl)
			break;
	}
	}
	return fl;
}

static struct ip6_flowlabel *ip6fl_get_next(struct seq_file *seq, struct ip6_flowlabel *fl)
{
	struct ip6fl_iter_state *state = ip6fl_seq_private(seq);
	struct net *net = seq_file_net(seq);

	fl = fl->next;
try_again:
	while (fl && fl->fl_net != net)
		fl = fl->next;

	while (!fl) {
		if (++state->bucket <= FL_HASH_MASK)
		if (++state->bucket <= FL_HASH_MASK) {
			fl = fl_ht[state->bucket];
		else
			goto try_again;
		} else
			break;
	}
	return fl;
@@ -708,7 +718,7 @@ static const struct seq_operations ip6fl_seq_ops = {

static int ip6fl_seq_open(struct inode *inode, struct file *file)
{
	return seq_open_private(file, &ip6fl_seq_ops,
	return seq_open_net(inode, file, &ip6fl_seq_ops,
			    sizeof(struct ip6fl_iter_state));
}

@@ -717,12 +727,13 @@ static const struct file_operations ip6fl_seq_fops = {
	.open		=	ip6fl_seq_open,
	.read		=	seq_read,
	.llseek		=	seq_lseek,
	.release	=	seq_release_private,
	.release	=	seq_release_net,
};

static int ip6_flowlabel_proc_init(struct net *net)
{
	if (!proc_net_fops_create(net, "ip6_flowlabel", S_IRUGO, &ip6fl_seq_fops))
	if (!proc_net_fops_create(net, "ip6_flowlabel",
				  S_IRUGO, &ip6fl_seq_fops))
		return -ENOMEM;
	return 0;
}
@@ -745,25 +756,21 @@ static inline void ip6_flowlabel_proc_fini(struct net *net)
static inline void ip6_flowlabel_net_exit(struct net *net)
{
	ip6_fl_purge(net);
	ip6_flowlabel_proc_fini(net);
}

static struct pernet_operations ip6_flowlabel_net_ops = {
	.init = ip6_flowlabel_proc_init,
	.exit = ip6_flowlabel_net_exit,
};

int ip6_flowlabel_init(void)
{
	int err;

	err = register_pernet_subsys(&ip6_flowlabel_net_ops);
	if (err)
		return err;
	return ip6_flowlabel_proc_init(&init_net);
	return register_pernet_subsys(&ip6_flowlabel_net_ops);
}

void ip6_flowlabel_cleanup(void)
{
	del_timer(&ip6_fl_gc_timer);
	unregister_pernet_subsys(&ip6_flowlabel_net_ops);
	ip6_flowlabel_proc_fini(&init_net);
}