mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:46:16 +00:00
73dbd8cf79
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/)
To avoid lots of small commits, this commit brings together network
changes from (as they appear in MAINTAINERS) LLC, MPTCP, NETROM NETWORK
LAYER, PHONET PROTOCOL, ROSE NETWORK LAYER, RXRPC SOCKETS, SCTP
PROTOCOL, SHARED MEMORY COMMUNICATIONS (SMC), TIPC NETWORK LAYER and
NETWORKING [IPSEC]
* Remove sentinel element from ctl_table structs.
* Replace empty array registration with the register_net_sysctl_sz call
in llc_sysctl_init
* Replace the for loop stop condition that tests for procname == NULL
with one that depends on array size in sctp_sysctl_net_register
* Remove instances where an array element is zeroed out to make it look
like a sentinel in xfrm_sysctl_init. This is not longer needed and is
safe after commit c899710fe7 ("networking: Update to
register_net_sysctl_sz") added the array size to the ctl_table
registration
* Use a table_size variable to keep the value of ARRAY_SIZE
Signed-off-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
89 lines
1.9 KiB
C
89 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/sysctl.h>
|
|
#include <linux/slab.h>
|
|
#include <net/net_namespace.h>
|
|
#include <net/xfrm.h>
|
|
|
|
static void __net_init __xfrm_sysctl_init(struct net *net)
|
|
{
|
|
net->xfrm.sysctl_aevent_etime = XFRM_AE_ETIME;
|
|
net->xfrm.sysctl_aevent_rseqth = XFRM_AE_SEQT_SIZE;
|
|
net->xfrm.sysctl_larval_drop = 1;
|
|
net->xfrm.sysctl_acq_expires = 30;
|
|
}
|
|
|
|
#ifdef CONFIG_SYSCTL
|
|
static struct ctl_table xfrm_table[] = {
|
|
{
|
|
.procname = "xfrm_aevent_etime",
|
|
.maxlen = sizeof(u32),
|
|
.mode = 0644,
|
|
.proc_handler = proc_douintvec
|
|
},
|
|
{
|
|
.procname = "xfrm_aevent_rseqth",
|
|
.maxlen = sizeof(u32),
|
|
.mode = 0644,
|
|
.proc_handler = proc_douintvec
|
|
},
|
|
{
|
|
.procname = "xfrm_larval_drop",
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec
|
|
},
|
|
{
|
|
.procname = "xfrm_acq_expires",
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec
|
|
},
|
|
};
|
|
|
|
int __net_init xfrm_sysctl_init(struct net *net)
|
|
{
|
|
struct ctl_table *table;
|
|
size_t table_size = ARRAY_SIZE(xfrm_table);
|
|
|
|
__xfrm_sysctl_init(net);
|
|
|
|
table = kmemdup(xfrm_table, sizeof(xfrm_table), GFP_KERNEL);
|
|
if (!table)
|
|
goto out_kmemdup;
|
|
table[0].data = &net->xfrm.sysctl_aevent_etime;
|
|
table[1].data = &net->xfrm.sysctl_aevent_rseqth;
|
|
table[2].data = &net->xfrm.sysctl_larval_drop;
|
|
table[3].data = &net->xfrm.sysctl_acq_expires;
|
|
|
|
/* Don't export sysctls to unprivileged users */
|
|
if (net->user_ns != &init_user_ns)
|
|
table_size = 0;
|
|
|
|
net->xfrm.sysctl_hdr = register_net_sysctl_sz(net, "net/core", table,
|
|
table_size);
|
|
if (!net->xfrm.sysctl_hdr)
|
|
goto out_register;
|
|
return 0;
|
|
|
|
out_register:
|
|
kfree(table);
|
|
out_kmemdup:
|
|
return -ENOMEM;
|
|
}
|
|
|
|
void __net_exit xfrm_sysctl_fini(struct net *net)
|
|
{
|
|
const struct ctl_table *table;
|
|
|
|
table = net->xfrm.sysctl_hdr->ctl_table_arg;
|
|
unregister_net_sysctl_table(net->xfrm.sysctl_hdr);
|
|
kfree(table);
|
|
}
|
|
#else
|
|
int __net_init xfrm_sysctl_init(struct net *net)
|
|
{
|
|
__xfrm_sysctl_init(net);
|
|
return 0;
|
|
}
|
|
#endif
|