lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: nf_conntrack: add nf_ct_kfree_compat_sysctl_table

Browse Source 
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>
This commit is contained in:
Gao feng
2012-06-21 04:36:40 +00:00
committed by Pablo Neira Ayuso
parent f1caad2745
commit f28997e27a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/netfilter/nf_conntrack_l4proto.h
View File

@@ -124,6 +124,14 @@ extern int nf_conntrack_l4proto_register(struct net *net,
extern void nf_conntrack_l4proto_unregister(struct net *net, extern void nf_conntrack_l4proto_unregister(struct net *net,
struct nf_conntrack_l4proto *proto); 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 */ /* Generic netlink helpers */
extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
const struct nf_conntrack_tuple *tuple); const struct nf_conntrack_tuple *tuple);

3
net/netfilter/nf_conntrack_proto.c
View File

@@ -361,8 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
if (err == 0) if (err == 0)
goto out; goto out;
kfree(pn->ctl_compat_table); nf_ct_kfree_compat_sysctl_table(pn);
pn->ctl_compat_table = NULL;
nf_ct_unregister_sysctl(&pn->ctl_table_header, nf_ct_unregister_sysctl(&pn->ctl_table_header,
&pn->ctl_table, &pn->ctl_table,
&pn->users); &pn->users);