From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH 01/13] netfilter: fix problem with proto register Date: Tue, 26 Jun 2012 16:36:20 +0200 Message-ID: <20120626143620.GA11165@1984> References: <1340289410-17642-1-git-send-email-gaofeng@cn.fujitsu.com> <20120625111253.GA4607@1984> <4FE92F1E.9020901@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org To: Gao feng Return-path: Received: from mail.us.es ([193.147.175.20]:58596 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757553Ab2FZOgW (ORCPT ); Tue, 26 Jun 2012 10:36:22 -0400 Content-Disposition: inline In-Reply-To: <4FE92F1E.9020901@cn.fujitsu.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: On Tue, Jun 26, 2012 at 11:40:14AM +0800, Gao feng wrote: > Hi Pablo: >=20 > =E4=BA=8E 2012=E5=B9=B406=E6=9C=8825=E6=97=A5 19:12, Pablo Neira Ayus= o =E5=86=99=E9=81=93: > > On Thu, Jun 21, 2012 at 10:36:38PM +0800, Gao feng wrote: > >> before commit 2c352f444ccfa966a1aa4fd8e9ee29381c467448 > >> (netfilter: nf_conntrack: prepare namespace support for > >> l4 protocol trackers), we register sysctl before register > >> protos, so if sysctl is registered faild, the protos will > >> not be registered. > >> > >> but now, we register protos first, and when register > >> sysctl failed, we can use protos too, it's different > >> from before. > >=20 > > No, this has to be an all-or-nothing game. If one fails, everything > > else that you've registered has to be unregistered. >=20 > indeed,this is an all-or-nothing game right now,please look at the ip= v4_net_init, > when we register nf_conntrack_l3proto_ipv4 failed,we will unregister = the already > registered l4protoes, and in nf_conntrack_l4proto_unregister,we will = call > nf_ct_l4proto_unregister_sysctl to free the sysctl table. I see proto->init_net allocates in->ctl_table, then nf_ct_l3proto_register_sysctl release it if it fails. I got confused because I did not see where that memory was being freed. Then, it's good. Still one more thing: > >> so change to register sysctl before register protos. > >> > >> Signed-off-by: Gao feng > >> --- > >> net/netfilter/nf_conntrack_proto.c | 36 +++++++++++++++++++++++= ------------- > >> 1 files changed, 23 insertions(+), 13 deletions(-) > >> > >> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf= _conntrack_proto.c > >> index 1ea9194..9bd88aa 100644 > >> --- a/net/netfilter/nf_conntrack_proto.c > >> +++ b/net/netfilter/nf_conntrack_proto.c > >> @@ -253,18 +253,23 @@ int nf_conntrack_l3proto_register(struct net= *net, > >> { > >> int ret =3D 0; > >> =20 > >> - if (net =3D=3D &init_net) > >> - ret =3D nf_conntrack_l3proto_register_net(proto); > >> + if (proto->init_net) { I think proto->init_net has to be mandatory since all protocol support pernet already. We can add BUG_ON at the beginning of the function if proto->init_net is not defined. I can manually add that to the patch if you see no inconvenience with it. -- To unsubscribe from this list: send the line "unsubscribe netfilter-dev= el" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html