| Message ID | 20240412-jag-sysctl_remset_net-v3-1-11187d13c211@samsung.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [v3,1/4] networking: Remove the now superfluous sentinel elements from ctl_table array | expand |
From: Joel Granados via B4 Relay <devnull+j.granados.samsung.com@kernel.org> Date: Fri, 12 Apr 2024 16:48:29 +0200 > From: Joel Granados <j.granados@samsung.com> > > This commit comes at the tail end of a greater effort to remove the > empty elements at the end of the ctl_table arrays (sentinels) which > will reduce the overall build time size of the kernel and run time > memory bloat by ~64 bytes per sentinel (further information Link : > https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) > > * Remove sentinel element from ctl_table structs. > * Remove extra element in ctl_table arrays declarations > * Remove instances where an array element is zeroed out to make it look > like a sentinel. This is not longer needed and is safe after commit > c899710fe7f9 ("networking: Update to register_net_sysctl_sz") added > the array size to the ctl_table registration > * Replace the for loop stop condition that tests for procname == NULL with > one that depends on array size > * Removed the "-1" that adjusted for having an extra empty element when > looping over ctl_table arrays > * Removing the unprivileged user check in ipv6_route_sysctl_init is > safe as it is replaced by calling ipv6_route_sysctl_table_size; > introduced in commit c899710fe7f9 ("networking: Update to > register_net_sysctl_sz") > * Replace empty array registration with the register_net_sysctl_sz call. > > Signed-off-by: Joel Granados <j.granados@samsung.com> > --- > net/core/neighbour.c | 5 +---- > net/core/sysctl_net_core.c | 9 ++++----- > net/dccp/sysctl.c | 2 -- > net/ieee802154/6lowpan/reassembly.c | 6 +----- > net/ipv4/devinet.c | 5 ++--- > net/ipv4/ip_fragment.c | 2 -- > net/ipv4/route.c | 8 ++------ > net/ipv4/sysctl_net_ipv4.c | 7 +++---- > net/ipv4/xfrm4_policy.c | 1 - > net/ipv6/addrconf.c | 5 +---- > net/ipv6/icmp.c | 1 - > net/ipv6/reassembly.c | 2 -- > net/ipv6/route.c | 5 ----- > net/ipv6/sysctl_net_ipv6.c | 4 +--- > net/ipv6/xfrm6_policy.c | 1 - > net/llc/sysctl_net_llc.c | 8 ++------ > net/mpls/af_mpls.c | 3 +-- > net/mptcp/ctrl.c | 1 - > net/netrom/sysctl_net_netrom.c | 1 - > net/phonet/sysctl.c | 1 - > net/rds/ib_sysctl.c | 1 - > net/rds/sysctl.c | 1 - > net/rds/tcp.c | 1 - > net/rose/sysctl_net_rose.c | 1 - > net/rxrpc/sysctl.c | 1 - > net/sctp/sysctl.c | 6 +----- > net/smc/smc_sysctl.c | 1 - > net/sunrpc/sysctl.c | 1 - > net/sunrpc/xprtrdma/svc_rdma.c | 1 - > net/sunrpc/xprtrdma/transport.c | 1 - > net/sunrpc/xprtsock.c | 1 - > net/tipc/sysctl.c | 1 - > net/unix/sysctl_net_unix.c | 1 - > net/x25/sysctl_net_x25.c | 1 - > net/xfrm/xfrm_sysctl.c | 5 +---- > 35 files changed, 20 insertions(+), 81 deletions(-) You may want to split patch based on subsystem or the type of changes to make review easier. > > diff --git a/net/core/neighbour.c b/net/core/neighbour.c > index 552719c3bbc3..b0327402b3e6 100644 > --- a/net/core/neighbour.c > +++ b/net/core/neighbour.c > @@ -3728,7 +3728,7 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write, > > static struct neigh_sysctl_table { > struct ctl_table_header *sysctl_header; > - struct ctl_table neigh_vars[NEIGH_VAR_MAX + 1]; > + struct ctl_table neigh_vars[NEIGH_VAR_MAX]; > } neigh_sysctl_template __read_mostly = { > .neigh_vars = { > NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(MCAST_PROBES, "mcast_solicit"), > @@ -3779,7 +3779,6 @@ static struct neigh_sysctl_table { > .extra2 = SYSCTL_INT_MAX, > .proc_handler = proc_dointvec_minmax, > }, > - {}, > }, > }; > > @@ -3807,8 +3806,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, > if (dev) { > dev_name_source = dev->name; > /* Terminate the table early */ You can remove this comment. > - memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0, > - sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL])); > neigh_vars_size = NEIGH_VAR_BASE_REACHABLE_TIME_MS + 1; > } else { > struct neigh_table *tbl = p->tbl; > diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c > index 6973dda3abda..46f5143e86be 100644 > --- a/net/core/sysctl_net_core.c > +++ b/net/core/sysctl_net_core.c > @@ -660,7 +660,6 @@ static struct ctl_table net_core_table[] = { > .proc_handler = proc_dointvec_minmax, > .extra1 = SYSCTL_ZERO, > }, > - { } > }; > > static struct ctl_table netns_core_table[] = { > @@ -697,7 +696,6 @@ static struct ctl_table netns_core_table[] = { > .extra2 = SYSCTL_ONE, > .proc_handler = proc_dou8vec_minmax, > }, > - { } > }; > > static int __init fb_tunnels_only_for_init_net_sysctl_setup(char *str) > @@ -715,7 +713,8 @@ __setup("fb_tunnels=", fb_tunnels_only_for_init_net_sysctl_setup); > > static __net_init int sysctl_core_net_init(struct net *net) > { > - struct ctl_table *tbl, *tmp; > + struct ctl_table *tbl; > + size_t table_size = ARRAY_SIZE(netns_core_table); When you add a new variable, please keep reverse xmas tree. Also, you can reuse this variable for the following register_net_sysctl_sz(), but it's inconsistent in the this patch.. table_size * sysctl_route_net_init * ipv4_sysctl_init_net ARRAY_SIZE * __addrconf_sysctl_register * ipv6_sysctl_net_init * mpls_dev_sysctl_register * sctp_sysctl_net_register > > tbl = netns_core_table; > if (!net_eq(net, &init_net)) { > @@ -723,8 +722,8 @@ static __net_init int sysctl_core_net_init(struct net *net) > if (tbl == NULL) > goto err_dup; > > - for (tmp = tbl; tmp->procname; tmp++) > - tmp->data += (char *)net - (char *)&init_net; > + for (int i = 0; i < table_size; ++i) > + (tbl + i)->data += (char *)net - (char *)&init_net; > } > > net->core.sysctl_hdr = register_net_sysctl_sz(net, "net/core", tbl, > diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c > index ee8d4f5afa72..3fc474d6e57d 100644 > --- a/net/dccp/sysctl.c > +++ b/net/dccp/sysctl.c > @@ -90,8 +90,6 @@ static struct ctl_table dccp_default_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_ms_jiffies, > }, > - > - { } > }; > > static struct ctl_table_header *dccp_table_header; > diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c > index 6dd960ec558c..09b18ee6df00 100644 > --- a/net/ieee802154/6lowpan/reassembly.c > +++ b/net/ieee802154/6lowpan/reassembly.c > @@ -338,7 +338,6 @@ static struct ctl_table lowpan_frags_ns_ctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { } > }; > > /* secret interval has been deprecated */ > @@ -351,7 +350,6 @@ static struct ctl_table lowpan_frags_ctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { } > }; > > static int __net_init lowpan_frags_ns_sysctl_register(struct net *net) > @@ -370,10 +368,8 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net) > goto err_alloc; > > /* Don't export sysctls to unprivileged users */ > - if (net->user_ns != &init_user_ns) { > - table[0].procname = NULL; > + if (net->user_ns != &init_user_ns) > table_size = 0; > - } > } > > table[0].data = &ieee802154_lowpan->fqdir->high_thresh; > diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c > index 7a437f0d4190..6195cc5be1fc 100644 > --- a/net/ipv4/devinet.c > +++ b/net/ipv4/devinet.c > @@ -2515,7 +2515,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write, > > static struct devinet_sysctl_table { > struct ctl_table_header *sysctl_header; > - struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX]; > + struct ctl_table devinet_vars[IPV4_DEVCONF_MAX]; > } devinet_sysctl = { > .devinet_vars = { > DEVINET_SYSCTL_COMPLEX_ENTRY(FORWARDING, "forwarding", > @@ -2578,7 +2578,7 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name, > if (!t) > goto out; > > - for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) { > + for (i = 0; i < ARRAY_SIZE(t->devinet_vars); i++) { > t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf; > t->devinet_vars[i].extra1 = p; > t->devinet_vars[i].extra2 = net; > @@ -2652,7 +2652,6 @@ static struct ctl_table ctl_forward_entry[] = { > .extra1 = &ipv4_devconf, > .extra2 = &init_net, > }, > - { }, > }; > #endif > > diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c > index a4941f53b523..e308779ed77b 100644 > --- a/net/ipv4/ip_fragment.c > +++ b/net/ipv4/ip_fragment.c > @@ -580,7 +580,6 @@ static struct ctl_table ip4_frags_ns_ctl_table[] = { > .proc_handler = proc_dointvec_minmax, > .extra1 = &dist_min, > }, > - { } > }; > > /* secret interval has been deprecated */ > @@ -593,7 +592,6 @@ static struct ctl_table ip4_frags_ctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { } > }; > > static int __net_init ip4_frags_ns_ctl_register(struct net *net) > diff --git a/net/ipv4/route.c b/net/ipv4/route.c > index c8f76f56dc16..deecfc0e5a91 100644 > --- a/net/ipv4/route.c > +++ b/net/ipv4/route.c > @@ -3509,7 +3509,6 @@ static struct ctl_table ipv4_route_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { } > }; > > static const char ipv4_route_flush_procname[] = "flush"; > @@ -3543,7 +3542,6 @@ static struct ctl_table ipv4_route_netns_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { }, > }; > > static __net_init int sysctl_route_net_init(struct net *net) > @@ -3561,16 +3559,14 @@ static __net_init int sysctl_route_net_init(struct net *net) > > /* Don't export non-whitelisted sysctls to unprivileged users */ > if (net->user_ns != &init_user_ns) { > - if (tbl[0].procname != ipv4_route_flush_procname) { > - tbl[0].procname = NULL; > + if (tbl[0].procname != ipv4_route_flush_procname) > table_size = 0; > - } > } > > /* Update the variables to point into the current struct net > * except for the first element flush > */ > - for (i = 1; i < ARRAY_SIZE(ipv4_route_netns_table) - 1; i++) > + for (i = 1; i < table_size; i++) > tbl[i].data += (void *)net - (void *)&init_net; > } > tbl[0].extra1 = net; > diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c > index 7e4f16a7dcc1..c8dae8fc682a 100644 > --- a/net/ipv4/sysctl_net_ipv4.c > +++ b/net/ipv4/sysctl_net_ipv4.c > @@ -575,7 +575,6 @@ static struct ctl_table ipv4_table[] = { > .extra1 = &sysctl_fib_sync_mem_min, > .extra2 = &sysctl_fib_sync_mem_max, > }, > - { } > }; > > static struct ctl_table ipv4_net_table[] = { > @@ -1502,12 +1501,12 @@ static struct ctl_table ipv4_net_table[] = { > .proc_handler = proc_dou8vec_minmax, > .extra1 = SYSCTL_ONE, > }, > - { } > }; > > static __net_init int ipv4_sysctl_init_net(struct net *net) > { > struct ctl_table *table; > + size_t table_size = ARRAY_SIZE(ipv4_net_table); nit: keep reverse xmax tree order. > > table = ipv4_net_table; > if (!net_eq(net, &init_net)) { > @@ -1517,7 +1516,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) > if (!table) > goto err_alloc; > > - for (i = 0; i < ARRAY_SIZE(ipv4_net_table) - 1; i++) { > + for (i = 0; i < table_size; i++) { > if (table[i].data) { > /* Update the variables to point into > * the current struct net > @@ -1533,7 +1532,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) > } > > net->ipv4.ipv4_hdr = register_net_sysctl_sz(net, "net/ipv4", table, > - ARRAY_SIZE(ipv4_net_table)); > + table_size); > if (!net->ipv4.ipv4_hdr) c> goto err_reg; > > diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c > index c33bca2c3841..4c74fec034c5 100644 > --- a/net/ipv4/xfrm4_policy.c > +++ b/net/ipv4/xfrm4_policy.c > @@ -152,7 +152,6 @@ static struct ctl_table xfrm4_policy_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { } > }; > > static __net_init int xfrm4_net_sysctl_init(struct net *net) > diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c > index 247bd4d8ee45..69619a52d4f8 100644 > --- a/net/ipv6/addrconf.c > +++ b/net/ipv6/addrconf.c > @@ -7181,9 +7181,6 @@ static const struct ctl_table addrconf_sysctl[] = { > .extra1 = SYSCTL_ZERO, > .extra2 = SYSCTL_TWO, > }, > - { > - /* sentinel */ > - } > }; > > static int __addrconf_sysctl_register(struct net *net, char *dev_name, > @@ -7197,7 +7194,7 @@ static int __addrconf_sysctl_register(struct net *net, char *dev_name, > if (!table) > goto out; > > - for (i = 0; table[i].data; i++) { > + for (i = 0; i < ARRAY_SIZE(addrconf_sysctl); i++) { ^^^ > table[i].data += (char *)p - (char *)&ipv6_devconf; > /* If one of these is already set, then it is not safe to > * overwrite either of them: this makes proc_dointvec_minmax > diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c > index 1635da07285f..91cbf8e8009f 100644 > --- a/net/ipv6/icmp.c > +++ b/net/ipv6/icmp.c > @@ -1206,7 +1206,6 @@ static struct ctl_table ipv6_icmp_table_template[] = { > .extra1 = SYSCTL_ZERO, > .extra2 = SYSCTL_ONE, > }, > - { }, > }; > > struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net) > diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c > index acb4f119e11f..afb343cb77ac 100644 > --- a/net/ipv6/reassembly.c > +++ b/net/ipv6/reassembly.c > @@ -436,7 +436,6 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { } > }; > > /* secret interval has been deprecated */ > @@ -449,7 +448,6 @@ static struct ctl_table ip6_frags_ctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { } > }; > > static int __net_init ip6_frags_ns_sysctl_register(struct net *net) > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index 1f4b935a0e57..b49137c3031b 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -6428,7 +6428,6 @@ static struct ctl_table ipv6_route_table_template[] = { > .extra1 = SYSCTL_ZERO, > .extra2 = SYSCTL_ONE, > }, > - { } > }; > > struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) > @@ -6452,10 +6451,6 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) > table[8].data = &net->ipv6.sysctl.ip6_rt_min_advmss; > table[9].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval; > table[10].data = &net->ipv6.sysctl.skip_notify_on_dev_down; > - > - /* Don't export sysctls to unprivileged users */ > - if (net->user_ns != &init_user_ns) > - table[1].procname = NULL; > } > > return table; > diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c > index 888676163e90..9f40bb12fbdd 100644 > --- a/net/ipv6/sysctl_net_ipv6.c > +++ b/net/ipv6/sysctl_net_ipv6.c > @@ -213,7 +213,6 @@ static struct ctl_table ipv6_table_template[] = { > .proc_handler = proc_doulongvec_minmax, > .extra2 = &ioam6_id_wide_max, > }, > - { } > }; > > static struct ctl_table ipv6_rotable[] = { > @@ -248,7 +247,6 @@ static struct ctl_table ipv6_rotable[] = { > .proc_handler = proc_dointvec, > }, > #endif /* CONFIG_NETLABEL */ > - { } > }; > > static int __net_init ipv6_sysctl_net_init(struct net *net) > @@ -264,7 +262,7 @@ static int __net_init ipv6_sysctl_net_init(struct net *net) > if (!ipv6_table) > goto out; > /* Update the variables to point into the current struct net */ > - for (i = 0; i < ARRAY_SIZE(ipv6_table_template) - 1; i++) > + for (i = 0; i < ARRAY_SIZE(ipv6_table_template); i++) ^^^ > ipv6_table[i].data += (void *)net - (void *)&init_net; > > ipv6_route_table = ipv6_route_sysctl_init(net); > diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c > index 42fb6996b077..499b5f5c19fc 100644 > --- a/net/ipv6/xfrm6_policy.c > +++ b/net/ipv6/xfrm6_policy.c > @@ -184,7 +184,6 @@ static struct ctl_table xfrm6_policy_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { } > }; > > static int __net_init xfrm6_net_sysctl_init(struct net *net) > diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c > index 8443a6d841b0..72e101135f8c 100644 > --- a/net/llc/sysctl_net_llc.c > +++ b/net/llc/sysctl_net_llc.c > @@ -44,11 +44,6 @@ static struct ctl_table llc2_timeout_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { }, > -}; > - > -static struct ctl_table llc_station_table[] = { > - { }, > }; > > static struct ctl_table_header *llc2_timeout_header; > @@ -56,8 +51,9 @@ static struct ctl_table_header *llc_station_header; > > int __init llc_sysctl_init(void) > { > + struct ctl_table empty[1] = {}; > llc2_timeout_header = register_net_sysctl(&init_net, "net/llc/llc2/timeout", llc2_timeout_table); > - llc_station_header = register_net_sysctl(&init_net, "net/llc/station", llc_station_table); > + llc_station_header = register_net_sysctl_sz(&init_net, "net/llc/station", empty, 0); Do we really need this ... ?? > > if (!llc2_timeout_header || !llc_station_header) { > llc_sysctl_exit(); > diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c > index 6dab883a08dd..e163fac55ffa 100644 > --- a/net/mpls/af_mpls.c > +++ b/net/mpls/af_mpls.c > @@ -1393,7 +1393,6 @@ static const struct ctl_table mpls_dev_table[] = { > .proc_handler = mpls_conf_proc, > .data = MPLS_PERDEV_SYSCTL_OFFSET(input_enabled), > }, > - { } > }; > > static int mpls_dev_sysctl_register(struct net_device *dev, > @@ -2689,7 +2688,7 @@ static int mpls_net_init(struct net *net) > /* Table data contains only offsets relative to the base of > * the mdev at this point, so make them absolute. > */ > - for (i = 0; i < ARRAY_SIZE(mpls_table) - 1; i++) > + for (i = 0; i < ARRAY_SIZE(mpls_table); i++) ^^^ > table[i].data = (char *)net + (uintptr_t)table[i].data; > > net->mpls.ctl = register_net_sysctl_sz(net, "net/mpls", table, > diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c > index 13fe0748dde8..8bf7c26a0878 100644 > --- a/net/mptcp/ctrl.c > +++ b/net/mptcp/ctrl.c > @@ -156,7 +156,6 @@ static struct ctl_table mptcp_sysctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - {} > }; > > static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) > diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c > index 79fb2d3f477b..7dc0fa628f2e 100644 > --- a/net/netrom/sysctl_net_netrom.c > +++ b/net/netrom/sysctl_net_netrom.c > @@ -140,7 +140,6 @@ static struct ctl_table nr_table[] = { > .extra1 = &min_reset, > .extra2 = &max_reset > }, > - { } > }; > > int __init nr_register_sysctl(void) > diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c > index 0d0bf41381c2..82fc22467a09 100644 > --- a/net/phonet/sysctl.c > +++ b/net/phonet/sysctl.c > @@ -81,7 +81,6 @@ static struct ctl_table phonet_table[] = { > .mode = 0644, > .proc_handler = proc_local_port_range, > }, > - { } > }; > > int __init phonet_sysctl_init(void) > diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c > index e4e41b3afce7..2af678e71e3c 100644 > --- a/net/rds/ib_sysctl.c > +++ b/net/rds/ib_sysctl.c > @@ -103,7 +103,6 @@ static struct ctl_table rds_ib_sysctl_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { } > }; > > void rds_ib_sysctl_exit(void) > diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c > index e381bbcd9cc1..025f518a4349 100644 > --- a/net/rds/sysctl.c > +++ b/net/rds/sysctl.c > @@ -89,7 +89,6 @@ static struct ctl_table rds_sysctl_rds_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { } > }; > > void rds_sysctl_exit(void) > diff --git a/net/rds/tcp.c b/net/rds/tcp.c > index 2dba7505b414..d8111ac83bb6 100644 > --- a/net/rds/tcp.c > +++ b/net/rds/tcp.c > @@ -86,7 +86,6 @@ static struct ctl_table rds_tcp_sysctl_table[] = { > .proc_handler = rds_tcp_skbuf_handler, > .extra1 = &rds_tcp_min_rcvbuf, > }, > - { } > }; > > u32 rds_tcp_write_seq(struct rds_tcp_connection *tc) > diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c > index d391d7758f52..d801315b7083 100644 > --- a/net/rose/sysctl_net_rose.c > +++ b/net/rose/sysctl_net_rose.c > @@ -112,7 +112,6 @@ static struct ctl_table rose_table[] = { > .extra1 = &min_window, > .extra2 = &max_window > }, > - { } > }; > > void __init rose_register_sysctl(void) > diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c > index c9bedd0e2d86..9bf9a1f6e4cb 100644 > --- a/net/rxrpc/sysctl.c > +++ b/net/rxrpc/sysctl.c > @@ -127,7 +127,6 @@ static struct ctl_table rxrpc_sysctl_table[] = { > .extra1 = (void *)SYSCTL_ONE, > .extra2 = (void *)&four, > }, > - { } > }; > > int __init rxrpc_sysctl_init(void) > diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c > index f65d6f92afcb..6894072af210 100644 > --- a/net/sctp/sysctl.c > +++ b/net/sctp/sysctl.c > @@ -80,8 +80,6 @@ static struct ctl_table sctp_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - > - { /* sentinel */ } > }; > > /* The following index defines are used in sctp_sysctl_net_register(). > @@ -384,8 +382,6 @@ static struct ctl_table sctp_net_table[] = { > .extra1 = SYSCTL_ZERO, > .extra2 = &pf_expose_max, > }, > - > - { /* sentinel */ } > }; > > static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write, > @@ -604,7 +600,7 @@ int sctp_sysctl_net_register(struct net *net) > if (!table) > return -ENOMEM; > > - for (i = 0; table[i].data; i++) > + for (i = 0; i < ARRAY_SIZE(sctp_net_table); i++) > table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp; > > table[SCTP_RTO_MIN_IDX].extra2 = &net->sctp.rto_max; > diff --git a/net/smc/smc_sysctl.c b/net/smc/smc_sysctl.c > index a5946d1b9d60..bd0b7e2f8824 100644 > --- a/net/smc/smc_sysctl.c > +++ b/net/smc/smc_sysctl.c > @@ -90,7 +90,6 @@ static struct ctl_table smc_table[] = { > .extra1 = &conns_per_lgr_min, > .extra2 = &conns_per_lgr_max, > }, > - { } > }; > > int __net_init smc_sysctl_net_init(struct net *net) > diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c > index 93941ab12549..5f3170a1c9bb 100644 > --- a/net/sunrpc/sysctl.c > +++ b/net/sunrpc/sysctl.c > @@ -160,7 +160,6 @@ static struct ctl_table debug_table[] = { > .mode = 0444, > .proc_handler = proc_do_xprt, > }, > - { } > }; > > void > diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c > index f86970733eb0..474f7a98fe9e 100644 > --- a/net/sunrpc/xprtrdma/svc_rdma.c > +++ b/net/sunrpc/xprtrdma/svc_rdma.c > @@ -209,7 +209,6 @@ static struct ctl_table svcrdma_parm_table[] = { > .extra1 = &zero, > .extra2 = &zero, > }, > - { }, > }; > > static void svc_rdma_proc_cleanup(void) > diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c > index 29b0562d62e7..9a8ce5df83ca 100644 > --- a/net/sunrpc/xprtrdma/transport.c > +++ b/net/sunrpc/xprtrdma/transport.c > @@ -137,7 +137,6 @@ static struct ctl_table xr_tunables_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { }, > }; > > #endif > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c > index bb9b747d58a1..f62f7b65455b 100644 > --- a/net/sunrpc/xprtsock.c > +++ b/net/sunrpc/xprtsock.c > @@ -160,7 +160,6 @@ static struct ctl_table xs_tunables_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec_jiffies, > }, > - { }, > }; > > /* > diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c > index 9fb65c988f7f..30d2e06e3d8c 100644 > --- a/net/tipc/sysctl.c > +++ b/net/tipc/sysctl.c > @@ -91,7 +91,6 @@ static struct ctl_table tipc_table[] = { > .mode = 0644, > .proc_handler = proc_doulongvec_minmax, > }, > - {} > }; > > int tipc_register_sysctl(void) > diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c > index 3e84b31c355a..ae45d4cfac39 100644 > --- a/net/unix/sysctl_net_unix.c > +++ b/net/unix/sysctl_net_unix.c > @@ -19,7 +19,6 @@ static struct ctl_table unix_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec > }, > - { } > }; > > int __net_init unix_sysctl_register(struct net *net) > diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c > index e9802afa43d0..643f50874dfe 100644 > --- a/net/x25/sysctl_net_x25.c > +++ b/net/x25/sysctl_net_x25.c > @@ -71,7 +71,6 @@ static struct ctl_table x25_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > - { }, > }; > > int __init x25_register_sysctl(void) > diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c > index 7fdeafc838a7..b0f542805e6e 100644 > --- a/net/xfrm/xfrm_sysctl.c > +++ b/net/xfrm/xfrm_sysctl.c > @@ -38,7 +38,6 @@ static struct ctl_table xfrm_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec > }, > - {} > }; > > int __net_init xfrm_sysctl_init(struct net *net) > @@ -57,10 +56,8 @@ int __net_init xfrm_sysctl_init(struct net *net) > table[3].data = &net->xfrm.sysctl_acq_expires; > > /* Don't export sysctls to unprivileged users */ > - if (net->user_ns != &init_user_ns) { > - table[0].procname = NULL; > + if (net->user_ns != &init_user_ns) > table_size = 0; > - } > > net->xfrm.sysctl_hdr = register_net_sysctl_sz(net, "net/core", table, > table_size); > > -- > 2.43.0 B
On Mon, 2024-04-15 at 16:12 -0700, Kuniyuki Iwashima wrote: > From: Joel Granados via B4 Relay <devnull+j.granados.samsung.com@kernel.org> > Date: Fri, 12 Apr 2024 16:48:29 +0200 > > From: Joel Granados <j.granados@samsung.com> > > > > This commit comes at the tail end of a greater effort to remove the > > empty elements at the end of the ctl_table arrays (sentinels) which > > will reduce the overall build time size of the kernel and run time > > memory bloat by ~64 bytes per sentinel (further information Link : > > https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) > > > > * Remove sentinel element from ctl_table structs. > > * Remove extra element in ctl_table arrays declarations > > * Remove instances where an array element is zeroed out to make it look > > like a sentinel. This is not longer needed and is safe after commit > > c899710fe7f9 ("networking: Update to register_net_sysctl_sz") added > > the array size to the ctl_table registration > > * Replace the for loop stop condition that tests for procname == NULL with > > one that depends on array size > > * Removed the "-1" that adjusted for having an extra empty element when > > looping over ctl_table arrays > > * Removing the unprivileged user check in ipv6_route_sysctl_init is > > safe as it is replaced by calling ipv6_route_sysctl_table_size; > > introduced in commit c899710fe7f9 ("networking: Update to > > register_net_sysctl_sz") > > * Replace empty array registration with the register_net_sysctl_sz call. > > > > Signed-off-by: Joel Granados <j.granados@samsung.com> > > --- > > net/core/neighbour.c | 5 +---- > > net/core/sysctl_net_core.c | 9 ++++----- > > net/dccp/sysctl.c | 2 -- > > net/ieee802154/6lowpan/reassembly.c | 6 +----- > > net/ipv4/devinet.c | 5 ++--- > > net/ipv4/ip_fragment.c | 2 -- > > net/ipv4/route.c | 8 ++------ > > net/ipv4/sysctl_net_ipv4.c | 7 +++---- > > net/ipv4/xfrm4_policy.c | 1 - > > net/ipv6/addrconf.c | 5 +---- > > net/ipv6/icmp.c | 1 - > > net/ipv6/reassembly.c | 2 -- > > net/ipv6/route.c | 5 ----- > > net/ipv6/sysctl_net_ipv6.c | 4 +--- > > net/ipv6/xfrm6_policy.c | 1 - > > net/llc/sysctl_net_llc.c | 8 ++------ > > net/mpls/af_mpls.c | 3 +-- > > net/mptcp/ctrl.c | 1 - > > net/netrom/sysctl_net_netrom.c | 1 - > > net/phonet/sysctl.c | 1 - > > net/rds/ib_sysctl.c | 1 - > > net/rds/sysctl.c | 1 - > > net/rds/tcp.c | 1 - > > net/rose/sysctl_net_rose.c | 1 - > > net/rxrpc/sysctl.c | 1 - > > net/sctp/sysctl.c | 6 +----- > > net/smc/smc_sysctl.c | 1 - > > net/sunrpc/sysctl.c | 1 - > > net/sunrpc/xprtrdma/svc_rdma.c | 1 - > > net/sunrpc/xprtrdma/transport.c | 1 - > > net/sunrpc/xprtsock.c | 1 - > > net/tipc/sysctl.c | 1 - > > net/unix/sysctl_net_unix.c | 1 - > > net/x25/sysctl_net_x25.c | 1 - > > net/xfrm/xfrm_sysctl.c | 5 +---- > > 35 files changed, 20 insertions(+), 81 deletions(-) > > You may want to split patch based on subsystem or the type of changes > to make review easier. I agree with Kuniyuki. I think the x25 chunks can me moved in the last patch, and at least sunrpc and rds could go in separate patches, possibly even xfrm and smc. Thanks, Paolo
On Mon, Apr 15, 2024 at 04:12:10PM -0700, Kuniyuki Iwashima wrote: > From: Joel Granados via B4 Relay <devnull+j.granados.samsung.com@kernel.org> > Date: Fri, 12 Apr 2024 16:48:29 +0200 > > From: Joel Granados <j.granados@samsung.com> ... > > Signed-off-by: Joel Granados <j.granados@samsung.com> > > --- > > net/core/neighbour.c | 5 +---- > > net/core/sysctl_net_core.c | 9 ++++----- > > net/dccp/sysctl.c | 2 -- > > net/ieee802154/6lowpan/reassembly.c | 6 +----- > > net/ipv4/devinet.c | 5 ++--- > > net/ipv4/ip_fragment.c | 2 -- > > net/ipv4/route.c | 8 ++------ > > net/ipv4/sysctl_net_ipv4.c | 7 +++---- > > net/ipv4/xfrm4_policy.c | 1 - > > net/ipv6/addrconf.c | 5 +---- > > net/ipv6/icmp.c | 1 - > > net/ipv6/reassembly.c | 2 -- > > net/ipv6/route.c | 5 ----- > > net/ipv6/sysctl_net_ipv6.c | 4 +--- > > net/ipv6/xfrm6_policy.c | 1 - > > net/llc/sysctl_net_llc.c | 8 ++------ > > net/mpls/af_mpls.c | 3 +-- > > net/mptcp/ctrl.c | 1 - > > net/netrom/sysctl_net_netrom.c | 1 - > > net/phonet/sysctl.c | 1 - > > net/rds/ib_sysctl.c | 1 - > > net/rds/sysctl.c | 1 - > > net/rds/tcp.c | 1 - > > net/rose/sysctl_net_rose.c | 1 - > > net/rxrpc/sysctl.c | 1 - > > net/sctp/sysctl.c | 6 +----- > > net/smc/smc_sysctl.c | 1 - > > net/sunrpc/sysctl.c | 1 - > > net/sunrpc/xprtrdma/svc_rdma.c | 1 - > > net/sunrpc/xprtrdma/transport.c | 1 - > > net/sunrpc/xprtsock.c | 1 - > > net/tipc/sysctl.c | 1 - > > net/unix/sysctl_net_unix.c | 1 - > > net/x25/sysctl_net_x25.c | 1 - > > net/xfrm/xfrm_sysctl.c | 5 +---- > > 35 files changed, 20 insertions(+), 81 deletions(-) > > You may want to split patch based on subsystem or the type of changes > to make review easier. That is fair. It is a big chunk:). I'll put the trivial patches together to avoid having an 18 commits to instead have 8. This is my proposal based on MAINTAINERS file: ### Not in MAINTAINERS / Orphaned net/core/neighbour.c net/core/sysctl_net_core.c net/ieee802154/6lowpan/reassembly.c net/mpls/af_mpls.c net/unix/sysctl_net_unix.c net/dccp/sysctl.c ### NETWORKING net/ipv4/devinet.c net/ipv4/ip_fragment.c net/ipv4/route.c net/ipv4/sysctl_net_ipv4.c net/ipv4/xfrm4_policy.c net/ipv6/addrconf.c net/ipv6/icmp.c net/ipv6/reassembly.c net/ipv6/route.c net/ipv6/sysctl_net_ipv6.c net/ipv6/xfrm6_policy.c ### RDS net/rds/ib_sysctl.c net/rds/sysctl.c net/rds/tcp.c ### SUNRPC net/sunrpc/sysctl.c net/sunrpc/xprtrdma/svc_rdma.c net/sunrpc/xprtrdma/transport.c net/sunrpc/xprtsock.c ### LLC/MTCP/NETROM/PHONET/ROSE/RXRPC/SCTP/SMC/TIPC/x.25/IPSEC net/llc/sysctl_net_llc.c net/mptcp/ctrl.c net/netrom/sysctl_net_netrom.c net/phonet/sysctl.c net/rose/sysctl_net_rose.c net/rxrpc/sysctl.c net/sctp/sysctl.c net/smc/smc_sysctl.c net/tipc/sysctl.c net/x25/sysctl_net_x25.c net/xfrm/xfrm_sysctl.c > > > > > > diff --git a/net/core/neighbour.c b/net/core/neighbour.c > > index 552719c3bbc3..b0327402b3e6 100644 > > --- a/net/core/neighbour.c > > +++ b/net/core/neighbour.c > > @@ -3728,7 +3728,7 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write, > > > > static struct neigh_sysctl_table { > > struct ctl_table_header *sysctl_header; > > - struct ctl_table neigh_vars[NEIGH_VAR_MAX + 1]; > > + struct ctl_table neigh_vars[NEIGH_VAR_MAX]; > > } neigh_sysctl_template __read_mostly = { > > .neigh_vars = { > > NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(MCAST_PROBES, "mcast_solicit"), > > @@ -3779,7 +3779,6 @@ static struct neigh_sysctl_table { > > .extra2 = SYSCTL_INT_MAX, > > .proc_handler = proc_dointvec_minmax, > > }, > > - {}, > > }, > > }; > > > > @@ -3807,8 +3806,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, > > if (dev) { > > dev_name_source = dev->name; > > /* Terminate the table early */ > > You can remove this comment. Why? I do not think we should remove it because it is what the change to neigh_vars_size is doing. > > > > - memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0, > > - sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL])); > > neigh_vars_size = NEIGH_VAR_BASE_REACHABLE_TIME_MS + 1; > > } else { > > struct neigh_table *tbl = p->tbl; > > diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c > > index 6973dda3abda..46f5143e86be 100644 > > --- a/net/core/sysctl_net_core.c > > +++ b/net/core/sysctl_net_core.c > > @@ -660,7 +660,6 @@ static struct ctl_table net_core_table[] = { > > .proc_handler = proc_dointvec_minmax, > > .extra1 = SYSCTL_ZERO, > > }, > > - { } > > }; > > > > static struct ctl_table netns_core_table[] = { > > @@ -697,7 +696,6 @@ static struct ctl_table netns_core_table[] = { > > .extra2 = SYSCTL_ONE, > > .proc_handler = proc_dou8vec_minmax, > > }, > > - { } > > }; > > > > static int __init fb_tunnels_only_for_init_net_sysctl_setup(char *str) > > @@ -715,7 +713,8 @@ __setup("fb_tunnels=", fb_tunnels_only_for_init_net_sysctl_setup); > > > > static __net_init int sysctl_core_net_init(struct net *net) > > { > > - struct ctl_table *tbl, *tmp; > > + struct ctl_table *tbl; > > + size_t table_size = ARRAY_SIZE(netns_core_table); > > When you add a new variable, please keep reverse xmas tree. Thx for pointing this out. Was not aware of this quirk in net code. Will include it for my next version. > > Also, you can reuse this variable for the following > register_net_sysctl_sz(), but it's inconsistent in the > this patch.. > > table_size > * sysctl_route_net_init > * ipv4_sysctl_init_net > > ARRAY_SIZE > * __addrconf_sysctl_register > * ipv6_sysctl_net_init > * mpls_dev_sysctl_register > * sctp_sysctl_net_register > > > > > > tbl = netns_core_table; > > if (!net_eq(net, &init_net)) { > > @@ -723,8 +722,8 @@ static __net_init int sysctl_core_net_init(struct net *net) > > if (tbl == NULL) > > goto err_dup; > > > > - for (tmp = tbl; tmp->procname; tmp++) > > - tmp->data += (char *)net - (char *)&init_net; > > + for (int i = 0; i < table_size; ++i) > > .devinet_vars = { ... > > .extra1 = SYSCTL_ONE, > > }, > > - { } > > }; > > > > static __net_init int ipv4_sysctl_init_net(struct net *net) > > { > > struct ctl_table *table; > > + size_t table_size = ARRAY_SIZE(ipv4_net_table); > > nit: keep reverse xmax tree order. Ok. > > > > > > table = ipv4_net_table; > > if (!net_eq(net, &init_net)) { > > @@ -1517,7 +1516,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) > > if (!table) > > goto err_alloc; > > > > - for (i = 0; i < ARRAY_SIZE(ipv4_net_table) - 1; i++) { ... > > > > static int __addrconf_sysctl_register(struct net *net, char *dev_name, > > @@ -7197,7 +7194,7 @@ static int __addrconf_sysctl_register(struct net *net, char *dev_name, > > if (!table) > > goto out; > > > > - for (i = 0; table[i].data; i++) { > > + for (i = 0; i < ARRAY_SIZE(addrconf_sysctl); i++) { > > ^^^ Did you mean reuse variable here? What does this mean? > > > > table[i].data += (char *)p - (char *)&ipv6_devconf; > > /* If one of these is already set, then it is not safe to > > * overwrite either of them: this makes proc_dointvec_minmax > > diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c > > index 1635da07285f..91cbf8e8009f 100644 > > --- a/net/ipv6/icmp.c > > +++ b/net/ipv6/icmp.c > > @@ -1206,7 +1206,6 @@ static struct ctl_table ipv6_icmp_table_template[] = { > > .extra1 = SYSCTL_ZERO, ... > > - { } > > }; > > > > static int __net_init ipv6_sysctl_net_init(struct net *net) > > @@ -264,7 +262,7 @@ static int __net_init ipv6_sysctl_net_init(struct net *net) > > if (!ipv6_table) > > goto out; > > /* Update the variables to point into the current struct net */ > > - for (i = 0; i < ARRAY_SIZE(ipv6_table_template) - 1; i++) > > + for (i = 0; i < ARRAY_SIZE(ipv6_table_template); i++) > > ^^^ Did you mean reuse variable here? What does this mean? > > > > ipv6_table[i].data += (void *)net - (void *)&init_net; > > > > ipv6_route_table = ipv6_route_sysctl_init(net); > > diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c > > index 42fb6996b077..499b5f5c19fc 100644 > > --- a/net/ipv6/xfrm6_policy.c > > +++ b/net/ipv6/xfrm6_policy.c > > @@ -184,7 +184,6 @@ static struct ctl_table xfrm6_policy_table[] = { > > .mode = 0644, > > .proc_handler = proc_dointvec, > > }, > > - { } > > }; > > > > static int __net_init xfrm6_net_sysctl_init(struct net *net) > > diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c > > index 8443a6d841b0..72e101135f8c 100644 > > --- a/net/llc/sysctl_net_llc.c > > +++ b/net/llc/sysctl_net_llc.c > > @@ -44,11 +44,6 @@ static struct ctl_table llc2_timeout_table[] = { > > .mode = 0644, > > .proc_handler = proc_dointvec_jiffies, > > }, > > - { }, > > -}; > > - > > -static struct ctl_table llc_station_table[] = { > > - { }, > > }; > > > > static struct ctl_table_header *llc2_timeout_header; > > @@ -56,8 +51,9 @@ static struct ctl_table_header *llc_station_header; > > > > int __init llc_sysctl_init(void) > > { > > + struct ctl_table empty[1] = {}; > > llc2_timeout_header = register_net_sysctl(&init_net, "net/llc/llc2/timeout", llc2_timeout_table); > > - llc_station_header = register_net_sysctl(&init_net, "net/llc/station", llc_station_table); > > + llc_station_header = register_net_sysctl_sz(&init_net, "net/llc/station", empty, 0); > > Do we really need this ... ?? That is a good question, but its something that needs to be address outside this patchset. I'm just keeping current behaviour. > > > > > > if (!llc2_timeout_header || !llc_station_header) { > > llc_sysctl_exit(); > > diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c > > index 6dab883a08dd..e163fac55ffa 100644 > > --- a/net/mpls/af_mpls.c > > +++ b/net/mpls/af_mpls.c > > @@ -1393,7 +1393,6 @@ static const struct ctl_table mpls_dev_table[] = { > > .proc_handler = mpls_conf_proc, > > .data = MPLS_PERDEV_SYSCTL_OFFSET(input_enabled), > > }, > > - { } > > }; > > > > static int mpls_dev_sysctl_register(struct net_device *dev, > > @@ -2689,7 +2688,7 @@ static int mpls_net_init(struct net *net) > > /* Table data contains only offsets relative to the base of > > * the mdev at this point, so make them absolute. > > */ > > - for (i = 0; i < ARRAY_SIZE(mpls_table) - 1; i++) > > + for (i = 0; i < ARRAY_SIZE(mpls_table); i++) > > ^^^ > > > > table[i].data = (char *)net + (uintptr_t)table[i].data; > > > > net->mpls.ctl = register_net_sysctl_sz(net, "net/mpls", table, > > diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c > > index 13fe0748dde8..8bf7c26a0878 100644 > > --- a/net/mptcp/ctrl.c > > +++ b/net/mptcp/ctrl.c ... > > > > net->xfrm.sysctl_hdr = register_net_sysctl_sz(net, "net/core", table, > > table_size); > > > > -- > > 2.43.0 > B Thx for the review Best
On Tue, Apr 16, 2024 at 10:18:42AM +0200, Paolo Abeni wrote: > On Mon, 2024-04-15 at 16:12 -0700, Kuniyuki Iwashima wrote: > > From: Joel Granados via B4 Relay <devnull+j.granados.samsung.com@kernel.org> > > Date: Fri, 12 Apr 2024 16:48:29 +0200 > > > From: Joel Granados <j.granados@samsung.com> ... > > > net/rxrpc/sysctl.c | 1 - > > > net/sctp/sysctl.c | 6 +----- > > > net/smc/smc_sysctl.c | 1 - > > > net/sunrpc/sysctl.c | 1 - > > > net/sunrpc/xprtrdma/svc_rdma.c | 1 - > > > net/sunrpc/xprtrdma/transport.c | 1 - > > > net/sunrpc/xprtsock.c | 1 - > > > net/tipc/sysctl.c | 1 - > > > net/unix/sysctl_net_unix.c | 1 - > > > net/x25/sysctl_net_x25.c | 1 - > > > net/xfrm/xfrm_sysctl.c | 5 +---- > > > 35 files changed, 20 insertions(+), 81 deletions(-) > > > > You may want to split patch based on subsystem or the type of changes > > to make review easier. > > I agree with Kuniyuki. I think the x25 chunks can me moved in the last > patch, and at least sunrpc and rds could go in separate patches, > possibly even xfrm and smc. No problem. I'll put x25 and ax.25 patches together into one commit. Thx Best
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 552719c3bbc3..b0327402b3e6 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -3728,7 +3728,7 @@ static int neigh_proc_base_reachable_time(struct ctl_table *ctl, int write, static struct neigh_sysctl_table { struct ctl_table_header *sysctl_header; - struct ctl_table neigh_vars[NEIGH_VAR_MAX + 1]; + struct ctl_table neigh_vars[NEIGH_VAR_MAX]; } neigh_sysctl_template __read_mostly = { .neigh_vars = { NEIGH_SYSCTL_ZERO_INTMAX_ENTRY(MCAST_PROBES, "mcast_solicit"), @@ -3779,7 +3779,6 @@ static struct neigh_sysctl_table { .extra2 = SYSCTL_INT_MAX, .proc_handler = proc_dointvec_minmax, }, - {}, }, }; @@ -3807,8 +3806,6 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p, if (dev) { dev_name_source = dev->name; /* Terminate the table early */ - memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0, - sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL])); neigh_vars_size = NEIGH_VAR_BASE_REACHABLE_TIME_MS + 1; } else { struct neigh_table *tbl = p->tbl; diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 6973dda3abda..46f5143e86be 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -660,7 +660,6 @@ static struct ctl_table net_core_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, }, - { } }; static struct ctl_table netns_core_table[] = { @@ -697,7 +696,6 @@ static struct ctl_table netns_core_table[] = { .extra2 = SYSCTL_ONE, .proc_handler = proc_dou8vec_minmax, }, - { } }; static int __init fb_tunnels_only_for_init_net_sysctl_setup(char *str) @@ -715,7 +713,8 @@ __setup("fb_tunnels=", fb_tunnels_only_for_init_net_sysctl_setup); static __net_init int sysctl_core_net_init(struct net *net) { - struct ctl_table *tbl, *tmp; + struct ctl_table *tbl; + size_t table_size = ARRAY_SIZE(netns_core_table); tbl = netns_core_table; if (!net_eq(net, &init_net)) { @@ -723,8 +722,8 @@ static __net_init int sysctl_core_net_init(struct net *net) if (tbl == NULL) goto err_dup; - for (tmp = tbl; tmp->procname; tmp++) - tmp->data += (char *)net - (char *)&init_net; + for (int i = 0; i < table_size; ++i) + (tbl + i)->data += (char *)net - (char *)&init_net; } net->core.sysctl_hdr = register_net_sysctl_sz(net, "net/core", tbl, diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c index ee8d4f5afa72..3fc474d6e57d 100644 --- a/net/dccp/sysctl.c +++ b/net/dccp/sysctl.c @@ -90,8 +90,6 @@ static struct ctl_table dccp_default_table[] = { .mode = 0644, .proc_handler = proc_dointvec_ms_jiffies, }, - - { } }; static struct ctl_table_header *dccp_table_header; diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c index 6dd960ec558c..09b18ee6df00 100644 --- a/net/ieee802154/6lowpan/reassembly.c +++ b/net/ieee802154/6lowpan/reassembly.c @@ -338,7 +338,6 @@ static struct ctl_table lowpan_frags_ns_ctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { } }; /* secret interval has been deprecated */ @@ -351,7 +350,6 @@ static struct ctl_table lowpan_frags_ctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { } }; static int __net_init lowpan_frags_ns_sysctl_register(struct net *net) @@ -370,10 +368,8 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net) goto err_alloc; /* Don't export sysctls to unprivileged users */ - if (net->user_ns != &init_user_ns) { - table[0].procname = NULL; + if (net->user_ns != &init_user_ns) table_size = 0; - } } table[0].data = &ieee802154_lowpan->fqdir->high_thresh; diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 7a437f0d4190..6195cc5be1fc 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -2515,7 +2515,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write, static struct devinet_sysctl_table { struct ctl_table_header *sysctl_header; - struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX]; + struct ctl_table devinet_vars[IPV4_DEVCONF_MAX]; } devinet_sysctl = { .devinet_vars = { DEVINET_SYSCTL_COMPLEX_ENTRY(FORWARDING, "forwarding", @@ -2578,7 +2578,7 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name, if (!t) goto out; - for (i = 0; i < ARRAY_SIZE(t->devinet_vars) - 1; i++) { + for (i = 0; i < ARRAY_SIZE(t->devinet_vars); i++) { t->devinet_vars[i].data += (char *)p - (char *)&ipv4_devconf; t->devinet_vars[i].extra1 = p; t->devinet_vars[i].extra2 = net; @@ -2652,7 +2652,6 @@ static struct ctl_table ctl_forward_entry[] = { .extra1 = &ipv4_devconf, .extra2 = &init_net, }, - { }, }; #endif diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index a4941f53b523..e308779ed77b 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -580,7 +580,6 @@ static struct ctl_table ip4_frags_ns_ctl_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = &dist_min, }, - { } }; /* secret interval has been deprecated */ @@ -593,7 +592,6 @@ static struct ctl_table ip4_frags_ctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { } }; static int __net_init ip4_frags_ns_ctl_register(struct net *net) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index c8f76f56dc16..deecfc0e5a91 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -3509,7 +3509,6 @@ static struct ctl_table ipv4_route_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; static const char ipv4_route_flush_procname[] = "flush"; @@ -3543,7 +3542,6 @@ static struct ctl_table ipv4_route_netns_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { }, }; static __net_init int sysctl_route_net_init(struct net *net) @@ -3561,16 +3559,14 @@ static __net_init int sysctl_route_net_init(struct net *net) /* Don't export non-whitelisted sysctls to unprivileged users */ if (net->user_ns != &init_user_ns) { - if (tbl[0].procname != ipv4_route_flush_procname) { - tbl[0].procname = NULL; + if (tbl[0].procname != ipv4_route_flush_procname) table_size = 0; - } } /* Update the variables to point into the current struct net * except for the first element flush */ - for (i = 1; i < ARRAY_SIZE(ipv4_route_netns_table) - 1; i++) + for (i = 1; i < table_size; i++) tbl[i].data += (void *)net - (void *)&init_net; } tbl[0].extra1 = net; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 7e4f16a7dcc1..c8dae8fc682a 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -575,7 +575,6 @@ static struct ctl_table ipv4_table[] = { .extra1 = &sysctl_fib_sync_mem_min, .extra2 = &sysctl_fib_sync_mem_max, }, - { } }; static struct ctl_table ipv4_net_table[] = { @@ -1502,12 +1501,12 @@ static struct ctl_table ipv4_net_table[] = { .proc_handler = proc_dou8vec_minmax, .extra1 = SYSCTL_ONE, }, - { } }; static __net_init int ipv4_sysctl_init_net(struct net *net) { struct ctl_table *table; + size_t table_size = ARRAY_SIZE(ipv4_net_table); table = ipv4_net_table; if (!net_eq(net, &init_net)) { @@ -1517,7 +1516,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) if (!table) goto err_alloc; - for (i = 0; i < ARRAY_SIZE(ipv4_net_table) - 1; i++) { + for (i = 0; i < table_size; i++) { if (table[i].data) { /* Update the variables to point into * the current struct net @@ -1533,7 +1532,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) } net->ipv4.ipv4_hdr = register_net_sysctl_sz(net, "net/ipv4", table, - ARRAY_SIZE(ipv4_net_table)); + table_size); if (!net->ipv4.ipv4_hdr) goto err_reg; diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index c33bca2c3841..4c74fec034c5 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -152,7 +152,6 @@ static struct ctl_table xfrm4_policy_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; static __net_init int xfrm4_net_sysctl_init(struct net *net) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 247bd4d8ee45..69619a52d4f8 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -7181,9 +7181,6 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_TWO, }, - { - /* sentinel */ - } }; static int __addrconf_sysctl_register(struct net *net, char *dev_name, @@ -7197,7 +7194,7 @@ static int __addrconf_sysctl_register(struct net *net, char *dev_name, if (!table) goto out; - for (i = 0; table[i].data; i++) { + for (i = 0; i < ARRAY_SIZE(addrconf_sysctl); i++) { table[i].data += (char *)p - (char *)&ipv6_devconf; /* If one of these is already set, then it is not safe to * overwrite either of them: this makes proc_dointvec_minmax diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 1635da07285f..91cbf8e8009f 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -1206,7 +1206,6 @@ static struct ctl_table ipv6_icmp_table_template[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, - { }, }; struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net) diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index acb4f119e11f..afb343cb77ac 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -436,7 +436,6 @@ static struct ctl_table ip6_frags_ns_ctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { } }; /* secret interval has been deprecated */ @@ -449,7 +448,6 @@ static struct ctl_table ip6_frags_ctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { } }; static int __net_init ip6_frags_ns_sysctl_register(struct net *net) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1f4b935a0e57..b49137c3031b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -6428,7 +6428,6 @@ static struct ctl_table ipv6_route_table_template[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, - { } }; struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) @@ -6452,10 +6451,6 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) table[8].data = &net->ipv6.sysctl.ip6_rt_min_advmss; table[9].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval; table[10].data = &net->ipv6.sysctl.skip_notify_on_dev_down; - - /* Don't export sysctls to unprivileged users */ - if (net->user_ns != &init_user_ns) - table[1].procname = NULL; } return table; diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 888676163e90..9f40bb12fbdd 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c @@ -213,7 +213,6 @@ static struct ctl_table ipv6_table_template[] = { .proc_handler = proc_doulongvec_minmax, .extra2 = &ioam6_id_wide_max, }, - { } }; static struct ctl_table ipv6_rotable[] = { @@ -248,7 +247,6 @@ static struct ctl_table ipv6_rotable[] = { .proc_handler = proc_dointvec, }, #endif /* CONFIG_NETLABEL */ - { } }; static int __net_init ipv6_sysctl_net_init(struct net *net) @@ -264,7 +262,7 @@ static int __net_init ipv6_sysctl_net_init(struct net *net) if (!ipv6_table) goto out; /* Update the variables to point into the current struct net */ - for (i = 0; i < ARRAY_SIZE(ipv6_table_template) - 1; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_table_template); i++) ipv6_table[i].data += (void *)net - (void *)&init_net; ipv6_route_table = ipv6_route_sysctl_init(net); diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 42fb6996b077..499b5f5c19fc 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -184,7 +184,6 @@ static struct ctl_table xfrm6_policy_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; static int __net_init xfrm6_net_sysctl_init(struct net *net) diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index 8443a6d841b0..72e101135f8c 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c @@ -44,11 +44,6 @@ static struct ctl_table llc2_timeout_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { }, -}; - -static struct ctl_table llc_station_table[] = { - { }, }; static struct ctl_table_header *llc2_timeout_header; @@ -56,8 +51,9 @@ static struct ctl_table_header *llc_station_header; int __init llc_sysctl_init(void) { + struct ctl_table empty[1] = {}; llc2_timeout_header = register_net_sysctl(&init_net, "net/llc/llc2/timeout", llc2_timeout_table); - llc_station_header = register_net_sysctl(&init_net, "net/llc/station", llc_station_table); + llc_station_header = register_net_sysctl_sz(&init_net, "net/llc/station", empty, 0); if (!llc2_timeout_header || !llc_station_header) { llc_sysctl_exit(); diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 6dab883a08dd..e163fac55ffa 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1393,7 +1393,6 @@ static const struct ctl_table mpls_dev_table[] = { .proc_handler = mpls_conf_proc, .data = MPLS_PERDEV_SYSCTL_OFFSET(input_enabled), }, - { } }; static int mpls_dev_sysctl_register(struct net_device *dev, @@ -2689,7 +2688,7 @@ static int mpls_net_init(struct net *net) /* Table data contains only offsets relative to the base of * the mdev at this point, so make them absolute. */ - for (i = 0; i < ARRAY_SIZE(mpls_table) - 1; i++) + for (i = 0; i < ARRAY_SIZE(mpls_table); i++) table[i].data = (char *)net + (uintptr_t)table[i].data; net->mpls.ctl = register_net_sysctl_sz(net, "net/mpls", table, diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 13fe0748dde8..8bf7c26a0878 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -156,7 +156,6 @@ static struct ctl_table mptcp_sysctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - {} }; static int mptcp_pernet_new_table(struct net *net, struct mptcp_pernet *pernet) diff --git a/net/netrom/sysctl_net_netrom.c b/net/netrom/sysctl_net_netrom.c index 79fb2d3f477b..7dc0fa628f2e 100644 --- a/net/netrom/sysctl_net_netrom.c +++ b/net/netrom/sysctl_net_netrom.c @@ -140,7 +140,6 @@ static struct ctl_table nr_table[] = { .extra1 = &min_reset, .extra2 = &max_reset }, - { } }; int __init nr_register_sysctl(void) diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c index 0d0bf41381c2..82fc22467a09 100644 --- a/net/phonet/sysctl.c +++ b/net/phonet/sysctl.c @@ -81,7 +81,6 @@ static struct ctl_table phonet_table[] = { .mode = 0644, .proc_handler = proc_local_port_range, }, - { } }; int __init phonet_sysctl_init(void) diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c index e4e41b3afce7..2af678e71e3c 100644 --- a/net/rds/ib_sysctl.c +++ b/net/rds/ib_sysctl.c @@ -103,7 +103,6 @@ static struct ctl_table rds_ib_sysctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; void rds_ib_sysctl_exit(void) diff --git a/net/rds/sysctl.c b/net/rds/sysctl.c index e381bbcd9cc1..025f518a4349 100644 --- a/net/rds/sysctl.c +++ b/net/rds/sysctl.c @@ -89,7 +89,6 @@ static struct ctl_table rds_sysctl_rds_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { } }; void rds_sysctl_exit(void) diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 2dba7505b414..d8111ac83bb6 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -86,7 +86,6 @@ static struct ctl_table rds_tcp_sysctl_table[] = { .proc_handler = rds_tcp_skbuf_handler, .extra1 = &rds_tcp_min_rcvbuf, }, - { } }; u32 rds_tcp_write_seq(struct rds_tcp_connection *tc) diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c index d391d7758f52..d801315b7083 100644 --- a/net/rose/sysctl_net_rose.c +++ b/net/rose/sysctl_net_rose.c @@ -112,7 +112,6 @@ static struct ctl_table rose_table[] = { .extra1 = &min_window, .extra2 = &max_window }, - { } }; void __init rose_register_sysctl(void) diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c index c9bedd0e2d86..9bf9a1f6e4cb 100644 --- a/net/rxrpc/sysctl.c +++ b/net/rxrpc/sysctl.c @@ -127,7 +127,6 @@ static struct ctl_table rxrpc_sysctl_table[] = { .extra1 = (void *)SYSCTL_ONE, .extra2 = (void *)&four, }, - { } }; int __init rxrpc_sysctl_init(void) diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index f65d6f92afcb..6894072af210 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -80,8 +80,6 @@ static struct ctl_table sctp_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - - { /* sentinel */ } }; /* The following index defines are used in sctp_sysctl_net_register(). @@ -384,8 +382,6 @@ static struct ctl_table sctp_net_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = &pf_expose_max, }, - - { /* sentinel */ } }; static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write, @@ -604,7 +600,7 @@ int sctp_sysctl_net_register(struct net *net) if (!table) return -ENOMEM; - for (i = 0; table[i].data; i++) + for (i = 0; i < ARRAY_SIZE(sctp_net_table); i++) table[i].data += (char *)(&net->sctp) - (char *)&init_net.sctp; table[SCTP_RTO_MIN_IDX].extra2 = &net->sctp.rto_max; diff --git a/net/smc/smc_sysctl.c b/net/smc/smc_sysctl.c index a5946d1b9d60..bd0b7e2f8824 100644 --- a/net/smc/smc_sysctl.c +++ b/net/smc/smc_sysctl.c @@ -90,7 +90,6 @@ static struct ctl_table smc_table[] = { .extra1 = &conns_per_lgr_min, .extra2 = &conns_per_lgr_max, }, - { } }; int __net_init smc_sysctl_net_init(struct net *net) diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index 93941ab12549..5f3170a1c9bb 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c @@ -160,7 +160,6 @@ static struct ctl_table debug_table[] = { .mode = 0444, .proc_handler = proc_do_xprt, }, - { } }; void diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c index f86970733eb0..474f7a98fe9e 100644 --- a/net/sunrpc/xprtrdma/svc_rdma.c +++ b/net/sunrpc/xprtrdma/svc_rdma.c @@ -209,7 +209,6 @@ static struct ctl_table svcrdma_parm_table[] = { .extra1 = &zero, .extra2 = &zero, }, - { }, }; static void svc_rdma_proc_cleanup(void) diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 29b0562d62e7..9a8ce5df83ca 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -137,7 +137,6 @@ static struct ctl_table xr_tunables_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { }, }; #endif diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index bb9b747d58a1..f62f7b65455b 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -160,7 +160,6 @@ static struct ctl_table xs_tunables_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, - { }, }; /* diff --git a/net/tipc/sysctl.c b/net/tipc/sysctl.c index 9fb65c988f7f..30d2e06e3d8c 100644 --- a/net/tipc/sysctl.c +++ b/net/tipc/sysctl.c @@ -91,7 +91,6 @@ static struct ctl_table tipc_table[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, - {} }; int tipc_register_sysctl(void) diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 3e84b31c355a..ae45d4cfac39 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c @@ -19,7 +19,6 @@ static struct ctl_table unix_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, - { } }; int __net_init unix_sysctl_register(struct net *net) diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index e9802afa43d0..643f50874dfe 100644 --- a/net/x25/sysctl_net_x25.c +++ b/net/x25/sysctl_net_x25.c @@ -71,7 +71,6 @@ static struct ctl_table x25_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { }, }; int __init x25_register_sysctl(void) diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c index 7fdeafc838a7..b0f542805e6e 100644 --- a/net/xfrm/xfrm_sysctl.c +++ b/net/xfrm/xfrm_sysctl.c @@ -38,7 +38,6 @@ static struct ctl_table xfrm_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, - {} }; int __net_init xfrm_sysctl_init(struct net *net) @@ -57,10 +56,8 @@ int __net_init xfrm_sysctl_init(struct net *net) table[3].data = &net->xfrm.sysctl_acq_expires; /* Don't export sysctls to unprivileged users */ - if (net->user_ns != &init_user_ns) { - table[0].procname = NULL; + if (net->user_ns != &init_user_ns) table_size = 0; - } net->xfrm.sysctl_hdr = register_net_sysctl_sz(net, "net/core", table, table_size);