c899710fe7
Move from register_net_sysctl to register_net_sysctl_sz for all the
networking related files. Do this while making sure to mirror the NULL
assignments with a table_size of zero for the unprivileged users.
We need to move to the new function in preparation for when we change
SIZE_MAX to ARRAY_SIZE() in the register_net_sysctl macro. Failing to do
so would erroneously allow ARRAY_SIZE() to be called on a pointer. We
hold off the SIZE_MAX to ARRAY_SIZE change until we have migrated all
the relevant net sysctl registering functions to register_net_sysctl_sz
in subsequent commits.
An additional size function was added to the following files in order to
calculate the size of an array that is defined in another file:
include/net/ipv6.h
net/ipv6/icmp.c
net/ipv6/route.c
net/ipv6/sysctl_net_ipv6.c
Signed-off-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
62 lines
1.2 KiB
C
62 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* NET4: Sysctl interface to net af_unix subsystem.
|
|
*
|
|
* Authors: Mike Shaver.
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sysctl.h>
|
|
|
|
#include <net/af_unix.h>
|
|
|
|
static struct ctl_table unix_table[] = {
|
|
{
|
|
.procname = "max_dgram_qlen",
|
|
.data = &init_net.unx.sysctl_max_dgram_qlen,
|
|
.maxlen = sizeof(int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec
|
|
},
|
|
{ }
|
|
};
|
|
|
|
int __net_init unix_sysctl_register(struct net *net)
|
|
{
|
|
struct ctl_table *table;
|
|
|
|
if (net_eq(net, &init_net)) {
|
|
table = unix_table;
|
|
} else {
|
|
table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
|
|
if (!table)
|
|
goto err_alloc;
|
|
|
|
table[0].data = &net->unx.sysctl_max_dgram_qlen;
|
|
}
|
|
|
|
net->unx.ctl = register_net_sysctl_sz(net, "net/unix", table,
|
|
ARRAY_SIZE(unix_table));
|
|
if (net->unx.ctl == NULL)
|
|
goto err_reg;
|
|
|
|
return 0;
|
|
|
|
err_reg:
|
|
if (!net_eq(net, &init_net))
|
|
kfree(table);
|
|
err_alloc:
|
|
return -ENOMEM;
|
|
}
|
|
|
|
void unix_sysctl_unregister(struct net *net)
|
|
{
|
|
struct ctl_table *table;
|
|
|
|
table = net->unx.ctl->ctl_table_arg;
|
|
unregister_net_sysctl_table(net->unx.ctl);
|
|
if (!net_eq(net, &init_net))
|
|
kfree(table);
|
|
}
|