netfilter: nf_ct_generic: add generic_kmemdup_sysctl_table function

This patch is a cleanup. It adds generic_kmemdup_sysctl_table to
split code into smaller chunks. Yet it prepares introduction
of nf_conntrack_proto_*_sysctl.c.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index d1ed7b44e07916d0fb09246069f8f4bce379fa79..7c11c54441945e142973675dedba243e06b001c2 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -135,34 +135,57 @@ static struct ctl_table generic_compat_sysctl_table[] = {
 #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
 #endif /* CONFIG_SYSCTL */
 
-static int generic_init_net(struct net *net, u_int16_t proto)
+static int generic_kmemdup_sysctl_table(struct nf_proto_net *pn,
+                                       struct nf_generic_net *gn)
 {
-       struct nf_generic_net *gn = generic_pernet(net);
-       struct nf_proto_net *pn = (struct nf_proto_net *)gn;
-       gn->timeout = nf_ct_generic_timeout;
 #ifdef CONFIG_SYSCTL
        pn->ctl_table = kmemdup(generic_sysctl_table,
                                sizeof(generic_sysctl_table),
                                GFP_KERNEL);
        if (!pn->ctl_table)
                return -ENOMEM;
+
        pn->ctl_table[0].data = &gn->timeout;
+#endif
+       return 0;
+}
 
+static int generic_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
+                                              struct nf_generic_net *gn)
+{
+#ifdef CONFIG_SYSCTL
 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
        pn->ctl_compat_table = kmemdup(generic_compat_sysctl_table,
                                       sizeof(generic_compat_sysctl_table),
                                       GFP_KERNEL);
-       if (!pn->ctl_compat_table) {
-               kfree(pn->ctl_table);
-               pn->ctl_table = NULL;
+       if (!pn->ctl_compat_table)
                return -ENOMEM;
-       }
+
        pn->ctl_compat_table[0].data = &gn->timeout;
 #endif
 #endif
        return 0;
 }
 
+static int generic_init_net(struct net *net, u_int16_t proto)
+{
+       int ret;
+       struct nf_generic_net *gn = generic_pernet(net);
+       struct nf_proto_net *pn = &gn->pn;
+
+       gn->timeout = nf_ct_generic_timeout;
+
+       ret = generic_kmemdup_compat_sysctl_table(pn, gn);
+       if (ret < 0)
+               return ret;
+
+       ret = generic_kmemdup_sysctl_table(pn, gn);
+       if (ret < 0)
+               nf_ct_kfree_compat_sysctl_table(pn);
+
+       return ret;
+}
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_generic __read_mostly =
 {
        .l3proto                = PF_UNSPEC,