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

Commit 3bb13dd4 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

netfilter: ipv6: nf_defrag: no longer reference init_net in nf_ct_frag6_sysctl_table 



(struct net *)->nf_frag.fqdir will soon be a pointer, so make
sure nf_ct_frag6_sysctl_table[] does not reference init_net.

nf_ct_frag6_sysctl_register() can perform the needed initialization
for all netns.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8668d0e2

net/ipv6/netfilter/nf_conntrack_reasm.c

+7 −12
Original line number Diff line number Diff line
@@ -58,26 +58,21 @@ static struct inet_frags nf_frags; 
static struct ctl_table nf_ct_frag6_sysctl_table[] = {

	{

		.procname	= "nf_conntrack_frag6_timeout",

		.data		= &init_net.nf_frag.fqdir.timeout,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

	{

		.procname	= "nf_conntrack_frag6_low_thresh",

		.data		= &init_net.nf_frag.fqdir.low_thresh,

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

		.extra2		= &init_net.nf_frag.fqdir.high_thresh

	},

	{

		.procname	= "nf_conntrack_frag6_high_thresh",

		.data		= &init_net.nf_frag.fqdir.high_thresh,

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

		.extra1		= &init_net.nf_frag.fqdir.low_thresh

	},

	{ }

};
@@ -93,6 +88,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net) 
				GFP_KERNEL);

		if (table == NULL)

			goto err_alloc;

	}



	table[0].data	= &net->nf_frag.fqdir.timeout;

	table[1].data	= &net->nf_frag.fqdir.low_thresh;
@@ -100,7 +96,6 @@ static int nf_ct_frag6_sysctl_register(struct net *net) 
	table[2].data	= &net->nf_frag.fqdir.high_thresh;

	table[2].extra1	= &net->nf_frag.fqdir.low_thresh;

	table[2].extra2	= &init_net.nf_frag.fqdir.high_thresh;

	}



	hdr = register_net_sysctl(net, "net/netfilter", table);

	if (hdr == NULL)