fat: cleanup fat_parse_long() error handling

[linux-2.6-omap-h63xx.git] / net / netfilter / nf_conntrack_standalone.c

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 169760ddc16b52ca6d79c5000e47c02b68e1f6f6..98106d4e89f033f5d6e22b17a0de9b2d6a709b5d 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -322,15 +322,11 @@ static void nf_conntrack_standalone_fini_proc(struct net *net)
 
 /* Sysctl support */
 
-int nf_conntrack_checksum __read_mostly = 1;
-EXPORT_SYMBOL_GPL(nf_conntrack_checksum);
-
 #ifdef CONFIG_SYSCTL
 /* Log invalid packets of a given protocol */
 static int log_invalid_proto_min = 0;
 static int log_invalid_proto_max = 255;
 
-static struct ctl_table_header *nf_ct_sysctl_header;
 static struct ctl_table_header *nf_ct_netfilter_header;
 
 static ctl_table nf_ct_sysctl_table[] = {
@@ -361,7 +357,7 @@ static ctl_table nf_ct_sysctl_table[] = {
        {
                .ctl_name       = NET_NF_CONNTRACK_CHECKSUM,
                .procname       = "nf_conntrack_checksum",
-               .data           = &nf_conntrack_checksum,
+               .data           = &init_net.ct.sysctl_checksum,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
@@ -369,7 +365,7 @@ static ctl_table nf_ct_sysctl_table[] = {
        {
                .ctl_name       = NET_NF_CONNTRACK_LOG_INVALID,
                .procname       = "nf_conntrack_log_invalid",
-               .data           = &nf_ct_log_invalid,
+               .data           = &init_net.ct.sysctl_log_invalid,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec_minmax,
@@ -407,42 +403,60 @@ static struct ctl_path nf_ct_path[] = {
        { }
 };
 
-EXPORT_SYMBOL_GPL(nf_ct_log_invalid);
-
-static int nf_conntrack_standalone_init_sysctl(void)
+static int nf_conntrack_standalone_init_sysctl(struct net *net)
 {
-       nf_ct_netfilter_header =
-               register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
-       if (!nf_ct_netfilter_header)
-               goto out;
-
-       nf_ct_sysctl_header =
-                register_sysctl_paths(nf_net_netfilter_sysctl_path,
-                                       nf_ct_sysctl_table);
-       if (!nf_ct_sysctl_header)
+       struct ctl_table *table;
+
+       if (net_eq(net, &init_net)) {
+               nf_ct_netfilter_header =
+                      register_sysctl_paths(nf_ct_path, nf_ct_netfilter_table);
+               if (!nf_ct_netfilter_header)
+                       goto out;
+       }
+
+       table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
+                       GFP_KERNEL);
+       if (!table)
+               goto out_kmemdup;
+
+       table[1].data = &net->ct.count;
+       table[3].data = &net->ct.sysctl_checksum;
+       table[4].data = &net->ct.sysctl_log_invalid;
+
+       net->ct.sysctl_header = register_net_sysctl_table(net,
+                                       nf_net_netfilter_sysctl_path, table);
+       if (!net->ct.sysctl_header)
                goto out_unregister_netfilter;
 
        return 0;
 
 out_unregister_netfilter:
-       unregister_sysctl_table(nf_ct_netfilter_header);
+       kfree(table);
+out_kmemdup:
+       if (net_eq(net, &init_net))
+               unregister_sysctl_table(nf_ct_netfilter_header);
 out:
        printk("nf_conntrack: can't register to sysctl.\n");
        return -ENOMEM;
 }
 
-static void nf_conntrack_standalone_fini_sysctl(void)
+static void nf_conntrack_standalone_fini_sysctl(struct net *net)
 {
-       unregister_sysctl_table(nf_ct_netfilter_header);
-       unregister_sysctl_table(nf_ct_sysctl_header);
+       struct ctl_table *table;
+
+       if (net_eq(net, &init_net))
+               unregister_sysctl_table(nf_ct_netfilter_header);
+       table = net->ct.sysctl_header->ctl_table_arg;
+       unregister_net_sysctl_table(net->ct.sysctl_header);
+       kfree(table);
 }
 #else
-static int nf_conntrack_standalone_init_sysctl(void)
+static int nf_conntrack_standalone_init_sysctl(struct net *net)
 {
        return 0;
 }
 
-static void nf_conntrack_standalone_fini_sysctl(void)
+static void nf_conntrack_standalone_fini_sysctl(struct net *net)
 {
 }
 #endif /* CONFIG_SYSCTL */
@@ -457,8 +471,15 @@ static int nf_conntrack_net_init(struct net *net)
        ret = nf_conntrack_standalone_init_proc(net);
        if (ret < 0)
                goto out_proc;
+       net->ct.sysctl_checksum = 1;
+       net->ct.sysctl_log_invalid = 0;
+       ret = nf_conntrack_standalone_init_sysctl(net);
+       if (ret < 0)
+               goto out_sysctl;
        return 0;
 
+out_sysctl:
+       nf_conntrack_standalone_fini_proc(net);
 out_proc:
        nf_conntrack_cleanup(net);
 out_init:
@@ -467,6 +488,7 @@ out_init:
 
 static void nf_conntrack_net_exit(struct net *net)
 {
+       nf_conntrack_standalone_fini_sysctl(net);
        nf_conntrack_standalone_fini_proc(net);
        nf_conntrack_cleanup(net);
 }
@@ -478,25 +500,11 @@ static struct pernet_operations nf_conntrack_net_ops = {
 
 static int __init nf_conntrack_standalone_init(void)
 {
-       int ret;
-
-       ret = register_pernet_subsys(&nf_conntrack_net_ops);
-       if (ret < 0)
-               goto out;
-       ret = nf_conntrack_standalone_init_sysctl();
-       if (ret < 0)
-               goto out_sysctl;
-       return 0;
-
-out_sysctl:
-       unregister_pernet_subsys(&nf_conntrack_net_ops);
-out:
-       return ret;
+       return register_pernet_subsys(&nf_conntrack_net_ops);
 }
 
 static void __exit nf_conntrack_standalone_fini(void)
 {
-       nf_conntrack_standalone_fini_sysctl();
        unregister_pernet_subsys(&nf_conntrack_net_ops);
 }