Commit 3125bdd6 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Ben Hutchings

decnet: Fix disappearing sysctl entries

When decnet is built as a module a simple:
echo 0.0 >/proc/sys/net/decnet/node_address

results in most of the sysctl entries under /proc/sys/net/decnet and
/proc/sys/net/decnet/conf disappearing.

For more details see http://www.spinics.net/lists/netdev/msg226123.html.

This change applies the same workaround used in
net/core/sysctl_net_core.c and net/ipv6/sysctl_net_ipv6.c of creating
a skeleton of decnet sysctl entries before doing anything else.

The problem first appeared in kernel 2.6.27.  The later rewrite of
sysctl in kernel 3.4 restored the previous behavior and eliminated the
need for this workaround.

This patch was heavily inspired by a similar but more complex patch by
Larry Baker.
Reported-by: default avatarLarry Baker <baker@usgs.gov>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 3ac94a54
......@@ -2354,6 +2354,8 @@ static const struct proto_ops dn_proto_ops = {
.sendpage = sock_no_sendpage,
};
void dn_register_sysctl_skeleton(void);
void dn_unregister_sysctl_skeleton(void);
void dn_register_sysctl(void);
void dn_unregister_sysctl(void);
......@@ -2374,6 +2376,7 @@ static int __init decnet_init(void)
if (rc != 0)
goto out;
dn_register_sysctl_skeleton();
dn_neigh_init();
dn_dev_init();
dn_route_init();
......@@ -2413,6 +2416,7 @@ static void __exit decnet_exit(void)
dn_fib_cleanup();
proc_net_remove(&init_net, "decnet");
dn_unregister_sysctl_skeleton();
proto_unregister(&dn_proto);
......
......@@ -55,6 +55,7 @@ static int max_decnet_no_fc_max_cwnd[] = { NSP_MAX_WINDOW };
static char node_name[7] = "???";
static struct ctl_table_header *dn_table_header = NULL;
static struct ctl_table_header *dn_skeleton_table_header = NULL;
/*
* ctype.h :-)
......@@ -357,6 +358,27 @@ static struct ctl_path dn_path[] = {
{ }
};
static struct ctl_table empty[1];
static struct ctl_table dn_skeleton[] = {
{
.procname = "conf",
.mode = 0555,
.child = empty,
},
{ }
};
void dn_register_sysctl_skeleton(void)
{
dn_skeleton_table_header = register_sysctl_paths(dn_path, dn_skeleton);
}
void dn_unregister_sysctl_skeleton(void)
{
unregister_sysctl_table(dn_skeleton_table_header);
}
void dn_register_sysctl(void)
{
dn_table_header = register_sysctl_paths(dn_path, dn_table);
......@@ -368,6 +390,12 @@ void dn_unregister_sysctl(void)
}
#else /* CONFIG_SYSCTL */
void dn_register_sysctl_skeleton(void)
{
}
void dn_unregister_sysctl_skeleton(void)
{
}
void dn_unregister_sysctl(void)
{
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment