diff options
| author | Gao feng | 2012-06-21 06:36:40 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2012-06-27 18:36:25 +0200 |
| commit | f28997e27a03abc679f13824a0574b09112eea37 (patch) | |
| tree | c2bd931367531ce99cb929acff6966e676515b7b | |
| parent | netfilter: nf_conntrack: prepare l4proto->init_net cleanup (diff) | |
| download | kernel-qcow2-linux-f28997e27a03abc679f13824a0574b09112eea37.tar.gz kernel-qcow2-linux-f28997e27a03abc679f13824a0574b09112eea37.tar.xz kernel-qcow2-linux-f28997e27a03abc679f13824a0574b09112eea37.zip | |
netfilter: nf_conntrack: add nf_ct_kfree_compat_sysctl_table
This patch is a cleanup.
It adds nf_ct_kfree_compat_sysctl_table to release l4proto's
compat sysctl table and set the compat sysctl table point to NULL.
This new function will be used by follow-up patches.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/net/netfilter/nf_conntrack_l4proto.h | 8 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 5dd60f2d02a1..08bb571b7abd 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h @@ -124,6 +124,14 @@ extern int nf_conntrack_l4proto_register(struct net *net, extern void nf_conntrack_l4proto_unregister(struct net *net, struct nf_conntrack_l4proto *proto); +static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn) +{ +#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT) + kfree(pn->ctl_compat_table); + pn->ctl_compat_table = NULL; +#endif +} + /* Generic netlink helpers */ extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, const struct nf_conntrack_tuple *tuple); diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 6f4b6f3deee5..9d6b6ab193a9 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -361,8 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net, if (err == 0) goto out; - kfree(pn->ctl_compat_table); - pn->ctl_compat_table = NULL; + nf_ct_kfree_compat_sysctl_table(pn); nf_ct_unregister_sysctl(&pn->ctl_table_header, &pn->ctl_table, &pn->users); |