netdev - Re: [PATCH 03/10] netfilter: add nf_ct_kfree_compat_sysctl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120615100806.GB13867@1984>
Date:	Fri, 15 Jun 2012 12:08:06 +0200
From:	Pablo Neira Ayuso <pablo@...filter.org>
To:	Gao feng <gaofeng@...fujitsu.com>
Cc:	netdev@...r.kernel.org, netfilter-devel@...r.kernel.org
Subject: Re: [PATCH 03/10] netfilter: add nf_ct_kfree_compat_sysctl_table
 to make codes clear

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@...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@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html