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

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

ieee820154: 6lowpan: no longer reference init_net in lowpan_frags_ns_ctl_table 



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

lowpan_frags_ns_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 3bb13dd4

net/ieee802154/6lowpan/reassembly.c

+6 −11
Original line number Original line Diff line number Diff line
@@ -326,23 +326,18 @@ int lowpan_frag_rcv(struct sk_buff *skb, u8 frag_type) 
static struct ctl_table lowpan_frags_ns_ctl_table[] = {

static struct ctl_table lowpan_frags_ns_ctl_table[] = {

	{

	{

		.procname	= "6lowpanfrag_high_thresh",

		.procname	= "6lowpanfrag_high_thresh",

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

		.maxlen		= sizeof(unsigned long),

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

		.proc_handler	= proc_doulongvec_minmax,

		.extra1		= &init_net.ieee802154_lowpan.fqdir.low_thresh

	},

	},

	{

	{

		.procname	= "6lowpanfrag_low_thresh",

		.procname	= "6lowpanfrag_low_thresh",

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

		.maxlen		= sizeof(unsigned long),

		.maxlen		= sizeof(unsigned long),

		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_doulongvec_minmax,

		.proc_handler	= proc_doulongvec_minmax,

		.extra2		= &init_net.ieee802154_lowpan.fqdir.high_thresh

	},

	},

	{

	{

		.procname	= "6lowpanfrag_time",

		.procname	= "6lowpanfrag_time",

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

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

		.proc_handler	= proc_dointvec_jiffies,
@@ -377,17 +372,17 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net) 
		if (table == NULL)

		if (table == NULL)

			goto err_alloc;

			goto err_alloc;





		/* Don't export sysctls to unprivileged users */

		if (net->user_ns != &init_user_ns)

			table[0].procname = NULL;

	}



	table[0].data	= &ieee802154_lowpan->fqdir.high_thresh;

	table[0].data	= &ieee802154_lowpan->fqdir.high_thresh;

	table[0].extra1	= &ieee802154_lowpan->fqdir.low_thresh;

	table[0].extra1	= &ieee802154_lowpan->fqdir.low_thresh;

	table[1].data	= &ieee802154_lowpan->fqdir.low_thresh;

	table[1].data	= &ieee802154_lowpan->fqdir.low_thresh;

	table[1].extra2	= &ieee802154_lowpan->fqdir.high_thresh;

	table[1].extra2	= &ieee802154_lowpan->fqdir.high_thresh;

	table[2].data	= &ieee802154_lowpan->fqdir.timeout;

	table[2].data	= &ieee802154_lowpan->fqdir.timeout;





		/* Don't export sysctls to unprivileged users */

		if (net->user_ns != &init_user_ns)

			table[0].procname = NULL;

	}



	hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);

	hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);

	if (hdr == NULL)

	if (hdr == NULL)

		goto err_reg;

		goto err_reg;