From 8dfdb31335ee5aa99c30bbfd37294844a7ffb648 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 24 May 2019 09:03:33 -0700
Subject: [PATCH] ipv4: no longer reference init_net in
ip4_frags_ns_ctl_table[]
(struct net *)->ipv4.fqdir will soon be a pointer, so make
sure ip4_frags_ns_ctl_table[] does not reference init_net.
ip4_frags_ns_ctl_register() can perform the needed initialization
for all netns.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv4/ip_fragment.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index f1831367cc2b1..fb035f4f36ca7 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -544,30 +544,24 @@ static int dist_min;
static struct ctl_table ip4_frags_ns_ctl_table[] = {
{
.procname = "ipfrag_high_thresh",
- .data = &init_net.ipv4.fqdir.high_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
- .extra1 = &init_net.ipv4.fqdir.low_thresh
},
{
.procname = "ipfrag_low_thresh",
- .data = &init_net.ipv4.fqdir.low_thresh,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = proc_doulongvec_minmax,
- .extra2 = &init_net.ipv4.fqdir.high_thresh
},
{
.procname = "ipfrag_time",
- .data = &init_net.ipv4.fqdir.timeout,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
{
.procname = "ipfrag_max_dist",
- .data = &init_net.ipv4.fqdir.max_dist,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
@@ -600,13 +594,13 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
if (!table)
goto err_alloc;
- table[0].data = &net->ipv4.fqdir.high_thresh;
- table[0].extra1 = &net->ipv4.fqdir.low_thresh;
- table[1].data = &net->ipv4.fqdir.low_thresh;
- table[1].extra2 = &net->ipv4.fqdir.high_thresh;
- table[2].data = &net->ipv4.fqdir.timeout;
- table[3].data = &net->ipv4.fqdir.max_dist;
}
+ table[0].data = &net->ipv4.fqdir.high_thresh;
+ table[0].extra1 = &net->ipv4.fqdir.low_thresh;
+ table[1].data = &net->ipv4.fqdir.low_thresh;
+ table[1].extra2 = &net->ipv4.fqdir.high_thresh;
+ table[2].data = &net->ipv4.fqdir.timeout;
+ table[3].data = &net->ipv4.fqdir.max_dist;
hdr = register_net_sysctl(net, "net/ipv4", table);
if (!hdr)