Previous NETNS patches broke CONFIG_SYSCTL=n case
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
struct ipv4_devconf;
struct netns_ipv4 {
struct ipv4_devconf;
struct netns_ipv4 {
struct ctl_table_header *forw_hdr;
struct ctl_table_header *forw_hdr;
struct ipv4_devconf *devconf_all;
struct ipv4_devconf *devconf_dflt;
};
struct ipv4_devconf *devconf_all;
struct ipv4_devconf *devconf_dflt;
};
__devinet_sysctl_unregister(&idev->cnf);
neigh_sysctl_unregister(idev->arp_parms);
}
__devinet_sysctl_unregister(&idev->cnf);
neigh_sysctl_unregister(idev->arp_parms);
}
static struct ctl_table ctl_forward_entry[] = {
{
static struct ctl_table ctl_forward_entry[] = {
{
{ .procname = "ipv4", .ctl_name = NET_IPV4, },
{ },
};
{ .procname = "ipv4", .ctl_name = NET_IPV4, },
{ },
};
static __net_init int devinet_init_net(struct net *net)
{
int err;
static __net_init int devinet_init_net(struct net *net)
{
int err;
struct ipv4_devconf *all, *dflt;
struct ipv4_devconf *all, *dflt;
+#ifdef CONFIG_SYSCTL
+ struct ctl_table *tbl = ctl_forward_entry;
struct ctl_table_header *forw_hdr;
struct ctl_table_header *forw_hdr;
err = -ENOMEM;
all = &ipv4_devconf;
dflt = &ipv4_devconf_dflt;
err = -ENOMEM;
all = &ipv4_devconf;
dflt = &ipv4_devconf_dflt;
- tbl = ctl_forward_entry;
if (net != &init_net) {
all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);
if (net != &init_net) {
all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);
if (dflt == NULL)
goto err_alloc_dflt;
if (dflt == NULL)
goto err_alloc_dflt;
tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
if (tbl == NULL)
goto err_alloc_ctl;
tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
if (tbl == NULL)
goto err_alloc_ctl;
tbl[0].data = &all->data[NET_IPV4_CONF_FORWARDING - 1];
tbl[0].extra1 = all;
tbl[0].extra2 = net;
tbl[0].data = &all->data[NET_IPV4_CONF_FORWARDING - 1];
tbl[0].extra1 = all;
tbl[0].extra2 = net;
forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
if (forw_hdr == NULL)
goto err_reg_ctl;
forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
if (forw_hdr == NULL)
goto err_reg_ctl;
+ net->ipv4.forw_hdr = forw_hdr;
- net->ipv4.forw_hdr = forw_hdr;
net->ipv4.devconf_all = all;
net->ipv4.devconf_dflt = dflt;
return 0;
net->ipv4.devconf_all = all;
net->ipv4.devconf_dflt = dflt;
return 0;
err_reg_all:
if (tbl != ctl_forward_entry)
kfree(tbl);
err_reg_all:
if (tbl != ctl_forward_entry)
kfree(tbl);
if (dflt != &ipv4_devconf_dflt)
kfree(dflt);
err_alloc_dflt:
if (dflt != &ipv4_devconf_dflt)
kfree(dflt);
err_alloc_dflt:
static __net_exit void devinet_exit_net(struct net *net)
{
static __net_exit void devinet_exit_net(struct net *net)
{
struct ctl_table *tbl;
tbl = net->ipv4.forw_hdr->ctl_table_arg;
struct ctl_table *tbl;
tbl = net->ipv4.forw_hdr->ctl_table_arg;
unregister_net_sysctl_table(net->ipv4.forw_hdr);
__devinet_sysctl_unregister(net->ipv4.devconf_dflt);
__devinet_sysctl_unregister(net->ipv4.devconf_all);
unregister_net_sysctl_table(net->ipv4.forw_hdr);
__devinet_sysctl_unregister(net->ipv4.devconf_dflt);
__devinet_sysctl_unregister(net->ipv4.devconf_all);
kfree(net->ipv4.devconf_dflt);
kfree(net->ipv4.devconf_all);
}
kfree(net->ipv4.devconf_dflt);
kfree(net->ipv4.devconf_all);
}