Patchwork [03/10] netfilter: add nf_ct_kfree_compat_sysctl_table to make codes clear

login
register
mail settings
Submitter Gao feng
Date June 14, 2012, 10:07 a.m.
Message ID <1339668445-23848-3-git-send-email-gaofeng@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/164886/
State Superseded
Headers show

Comments

Gao feng - June 14, 2012, 10:07 a.m.
add function nf_ct_kfree_compat_sysctl_table to kfree l4proto's
compat sysctl table and set the sysctl table point to NULL.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
 include/net/netfilter/nf_conntrack_l4proto.h |    8 ++++++++
 net/netfilter/nf_conntrack_proto.c           |    4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)
Pablo Neira - June 14, 2012, 6:06 p.m.
On Thu, Jun 14, 2012 at 06:07:18PM +0800, Gao feng wrote:
> add function nf_ct_kfree_compat_sysctl_table to kfree l4proto's
> compat sysctl table and set the sysctl table point to NULL.
> 
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
>  include/net/netfilter/nf_conntrack_l4proto.h |    8 ++++++++
>  net/netfilter/nf_conntrack_proto.c           |    4 +---
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
> index 5dd60f2..889b717 100644
> --- a/include/net/netfilter/nf_conntrack_l4proto.h
> +++ b/include/net/netfilter/nf_conntrack_l4proto.h
> @@ -132,6 +132,14 @@ extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
>  extern int nf_ct_port_nlattr_tuple_size(void);
>  extern const struct nla_policy nf_ct_port_nla_policy[];
>  
> +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
> +}
> +
>  #ifdef CONFIG_SYSCTL
>  #ifdef DEBUG_INVALID_PACKETS
>  #define LOG_INVALID(net, proto)				\
> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
> index 8fc0332..c9df1b4 100644
> --- a/net/netfilter/nf_conntrack_proto.c
> +++ b/net/netfilter/nf_conntrack_proto.c
> @@ -361,9 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
>  					    NULL);
>  		if (err == 0)
>  			goto out;
> -
> -		kfree(pn->ctl_compat_table);
> -		pn->ctl_compat_table = NULL;
> +		nf_ct_kfree_compat_sysctl_table(pn);

if this is the only client of this function, then make it static and
define it inside nf_conntrack_proto.c

>  		nf_ct_unregister_sysctl(&pn->ctl_table_header,
>  					&pn->ctl_table,
>  					&pn->users);
> -- 
> 1.7.7.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Gao feng - June 15, 2012, 1:36 a.m.
Hi Pablo:

于 2012年06月15日 02:06, Pablo Neira Ayuso 写道:
> On Thu, Jun 14, 2012 at 06:07:18PM +0800, Gao feng wrote:
>> add function nf_ct_kfree_compat_sysctl_table to kfree l4proto's
>> compat sysctl table and set the sysctl table point to NULL.
>>
>> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
>> ---
>>  include/net/netfilter/nf_conntrack_l4proto.h |    8 ++++++++
>>  net/netfilter/nf_conntrack_proto.c           |    4 +---
>>  2 files changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
>> index 5dd60f2..889b717 100644
>> --- a/include/net/netfilter/nf_conntrack_l4proto.h
>> +++ b/include/net/netfilter/nf_conntrack_l4proto.h
>> @@ -132,6 +132,14 @@ extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
>>  extern int nf_ct_port_nlattr_tuple_size(void);
>>  extern const struct nla_policy nf_ct_port_nla_policy[];
>>  
>> +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
>> +}
>> +
>>  #ifdef CONFIG_SYSCTL
>>  #ifdef DEBUG_INVALID_PACKETS
>>  #define LOG_INVALID(net, proto)				\
>> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
>> index 8fc0332..c9df1b4 100644
>> --- a/net/netfilter/nf_conntrack_proto.c
>> +++ b/net/netfilter/nf_conntrack_proto.c
>> @@ -361,9 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
>>  					    NULL);
>>  		if (err == 0)
>>  			goto out;
>> -
>> -		kfree(pn->ctl_compat_table);
>> -		pn->ctl_compat_table = NULL;
>> +		nf_ct_kfree_compat_sysctl_table(pn);
> 
> if this is the only client of this function, then make it static and
> define it inside nf_conntrack_proto.c
> 

tcp_init_net,udp_init_net use this function too.

Thanks
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira - June 15, 2012, 10:08 a.m.
On Fri, Jun 15, 2012 at 09:36:06AM +0800, Gao feng wrote:
> Hi Pablo:
> 
> 于 2012年06月15日 02:06, Pablo Neira Ayuso 写道:
> > On Thu, Jun 14, 2012 at 06:07:18PM +0800, Gao feng wrote:
> >> add function nf_ct_kfree_compat_sysctl_table to kfree l4proto's
> >> compat sysctl table and set the sysctl table point to NULL.
> >>
> >> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> >> ---
> >>  include/net/netfilter/nf_conntrack_l4proto.h |    8 ++++++++
> >>  net/netfilter/nf_conntrack_proto.c           |    4 +---
> >>  2 files changed, 9 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
> >> index 5dd60f2..889b717 100644
> >> --- a/include/net/netfilter/nf_conntrack_l4proto.h
> >> +++ b/include/net/netfilter/nf_conntrack_l4proto.h
> >> @@ -132,6 +132,14 @@ extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
> >>  extern int nf_ct_port_nlattr_tuple_size(void);
> >>  extern const struct nla_policy nf_ct_port_nla_policy[];
> >>  
> >> +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
> >> +}

inline is usually reserved for fast path, not initialization path.

Although this function is fairly small, I think I prefer that this
function is defined in nf_conntrack_proto.c and exported.

> >> +
> >>  #ifdef CONFIG_SYSCTL
> >>  #ifdef DEBUG_INVALID_PACKETS
> >>  #define LOG_INVALID(net, proto)				\
> >> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
> >> index 8fc0332..c9df1b4 100644
> >> --- a/net/netfilter/nf_conntrack_proto.c
> >> +++ b/net/netfilter/nf_conntrack_proto.c
> >> @@ -361,9 +361,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
> >>  					    NULL);
> >>  		if (err == 0)
> >>  			goto out;
> >> -
> >> -		kfree(pn->ctl_compat_table);
> >> -		pn->ctl_compat_table = NULL;
> >> +		nf_ct_kfree_compat_sysctl_table(pn);
> > 
> > if this is the only client of this function, then make it static and
> > define it inside nf_conntrack_proto.c
> > 
> 
> tcp_init_net,udp_init_net use this function too.
> 
> Thanks
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 5dd60f2..889b717 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -132,6 +132,14 @@  extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[],
 extern int nf_ct_port_nlattr_tuple_size(void);
 extern const struct nla_policy nf_ct_port_nla_policy[];
 
+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
+}
+
 #ifdef CONFIG_SYSCTL
 #ifdef DEBUG_INVALID_PACKETS
 #define LOG_INVALID(net, proto)				\
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index 8fc0332..c9df1b4 100644
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -361,9 +361,7 @@  int nf_ct_l4proto_register_sysctl(struct net *net,
 					    NULL);
 		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);