iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nf_ct_icmp: add icmp_kmemdup[_compat]_sysctl_table function

Browse Source 
Split sysctl function into smaller chucks to cleanup code and prepare
patches to reduce ifdef pollution.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Gao feng 2012-06-21 04:36:49 +00:00 committed by Pablo Neira Ayuso
parent 54b8873f7c
commit a9082b45ad
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/ipv4/netfilter/nf_conntrack_proto_icmp.c
View File

@ -337,34 +337,57 @@ static struct ctl_table icmp_compat_sysctl_table[] = {
#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
static int icmp_init_net(struct net *net, u_int16_t proto) static int icmp_kmemdup_sysctl_table(struct nf_proto_net *pn,
struct nf_icmp_net *in)
{ {
struct nf_icmp_net *in = icmp_pernet(net);
struct nf_proto_net *pn = (struct nf_proto_net *)in;
in->timeout = nf_ct_icmp_timeout;
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
pn->ctl_table = kmemdup(icmp_sysctl_table, pn->ctl_table = kmemdup(icmp_sysctl_table,
sizeof(icmp_sysctl_table), sizeof(icmp_sysctl_table),
GFP_KERNEL); GFP_KERNEL);
if (!pn->ctl_table) if (!pn->ctl_table)
return -ENOMEM; return -ENOMEM;
pn->ctl_table[0].data = &in->timeout; pn->ctl_table[0].data = &in->timeout;
#endif
return 0;
}
static int icmp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
struct nf_icmp_net *in)
{
#ifdef CONFIG_SYSCTL
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
pn->ctl_compat_table = kmemdup(icmp_compat_sysctl_table, pn->ctl_compat_table = kmemdup(icmp_compat_sysctl_table,
sizeof(icmp_compat_sysctl_table), sizeof(icmp_compat_sysctl_table),
GFP_KERNEL); GFP_KERNEL);
if (!pn->ctl_compat_table) { if (!pn->ctl_compat_table)
kfree(pn->ctl_table);
pn->ctl_table = NULL;
return -ENOMEM; return -ENOMEM;
}
pn->ctl_compat_table[0].data = &in->timeout; pn->ctl_compat_table[0].data = &in->timeout;
#endif #endif
#endif #endif
return 0; return 0;
} }
static int icmp_init_net(struct net *net, u_int16_t proto)
{
int ret;
struct nf_icmp_net *in = icmp_pernet(net);
struct nf_proto_net *pn = &in->pn;
in->timeout = nf_ct_icmp_timeout;
ret = icmp_kmemdup_compat_sysctl_table(pn, in);
if (ret < 0)
return ret;
ret = icmp_kmemdup_sysctl_table(pn, in);
if (ret < 0)
nf_ct_kfree_compat_sysctl_table(pn);
return ret;
}
struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =
{ {
.l3proto = PF_INET, .l3proto = PF_INET,