net sysctl: Register an empty /proc/sys/net
Implementation limitations of the sysctl core won't let /proc/sys/net reside in a network namespace. /proc/sys/net at least must be registered as a normal sysctl. So register /proc/sys/net early as an empty directory to guarantee we don't violate this constraint and hit bugs in the sysctl implementation. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ab41a2ca50
commit
bc8a36942a
|
@ -88,9 +88,18 @@ static struct pernet_operations sysctl_pernet_ops = {
|
||||||
.exit = sysctl_net_exit,
|
.exit = sysctl_net_exit,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static struct ctl_table_header *net_header;
|
||||||
static __init int net_sysctl_init(void)
|
static __init int net_sysctl_init(void)
|
||||||
{
|
{
|
||||||
int ret;
|
static struct ctl_table empty[1];
|
||||||
|
int ret = -ENOMEM;
|
||||||
|
/* Avoid limitations in the sysctl implementation by
|
||||||
|
* registering "/proc/sys/net" as an empty directory not in a
|
||||||
|
* network namespace.
|
||||||
|
*/
|
||||||
|
net_header = register_sysctl("net", empty);
|
||||||
|
if (!net_header)
|
||||||
|
goto out;
|
||||||
ret = register_pernet_subsys(&sysctl_pernet_ops);
|
ret = register_pernet_subsys(&sysctl_pernet_ops);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in New Issue