From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH net-next v2 01/12] netfilter: fix problem with proto register
Date: Sat, 16 Jun 2012 12:50:37 +0200 [thread overview]
Message-ID: <20120616105037.GA18251@1984> (raw)
In-Reply-To: <1339818083-31356-1-git-send-email-gaofeng@cn.fujitsu.com>
On Sat, Jun 16, 2012 at 11:41:12AM +0800, Gao feng wrote:
> commit 2c352f444ccfa966a1aa4fd8e9ee29381c467448
> (netfilter: nf_conntrack: prepare namespace support for
> l4 protocol trackers) register proto before register sysctl.
>
> it changes the behavior that when register sysctl failed, the
> proto should not be registered too.
>
> so change to register sysctl before register protos.
Could you explain why we need to change the order in the registration?
ie. now first proto->init_net then sysctl things.
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
> net/netfilter/nf_conntrack_proto.c | 37 ++++++++++++++++++++++-------------
> 1 files changed, 23 insertions(+), 14 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
> index 1ea9194..a434dd7 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 = 0;
>
> - if (net == &init_net)
> - ret = nf_conntrack_l3proto_register_net(proto);
> + if (proto->init_net) {
> + ret = proto->init_net(net);
> + if (ret < 0)
> + return ret;
> + }
>
> + ret = nf_ct_l3proto_register_sysctl(net, proto);
> if (ret < 0)
> return ret;
>
> - if (proto->init_net) {
> - ret = proto->init_net(net);
> + if (net == &init_net) {
> + ret = nf_conntrack_l3proto_register_net(proto);
> if (ret < 0)
> - return ret;
> + nf_ct_l3proto_unregister_sysctl(net, proto);
> }
> - return nf_ct_l3proto_register_sysctl(net, proto);
> +
> + return ret;
> }
> EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_register);
>
> @@ -454,19 +459,23 @@ int nf_conntrack_l4proto_register(struct net *net,
> struct nf_conntrack_l4proto *l4proto)
> {
> int ret = 0;
> - if (net == &init_net)
> - ret = nf_conntrack_l4proto_register_net(l4proto);
> -
> - if (ret < 0)
> - return ret;
> -
> - if (l4proto->init_net)
> + if (l4proto->init_net) {
> ret = l4proto->init_net(net);
> + if (ret < 0)
> + return ret;
> + }
>
> + ret = nf_ct_l4proto_register_sysctl(net, l4proto);
> if (ret < 0)
> return ret;
>
> - return nf_ct_l4proto_register_sysctl(net, l4proto);
> + if (net == &init_net) {
> + ret = nf_conntrack_l4proto_register_net(l4proto);
> + if (ret < 0)
> + nf_ct_l4proto_unregister_sysctl(net, l4proto);
> + }
> +
> + return ret;
> }
> EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_register);
>
> --
> 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
next prev parent reply other threads:[~2012-06-16 10:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-16 3:41 [PATCH net-next v2 01/12] netfilter: fix problem with proto register Gao feng
2012-06-16 3:41 ` [PATCH net-next v2 02/12] netfilter: add parameter proto for l4proto.init_net Gao feng
2012-06-16 3:41 ` [PATCH net-next v2 03/12] netfilter: add nf_ct_kfree_compat_sysctl_table to make codes clear Gao feng
2012-06-16 11:10 ` Pablo Neira Ayuso
2012-06-16 3:41 ` [PATCH net-next v2 04/12] netfilter: regard users as refcount for l4proto's per-net data Gao feng
2012-06-16 10:54 ` Pablo Neira Ayuso
2012-06-16 3:41 ` [PATCH net-next v2 05/12] netfilter: merge tcpv[4,6]_net_init into tcp_net_init Gao feng
2012-06-16 10:55 ` Pablo Neira Ayuso
2012-06-16 3:41 ` [PATCH net-next v2 06/12] netfilter: merge udpv[4,6]_net_init into udp_net_init Gao feng
2012-06-16 11:22 ` Pablo Neira Ayuso
2012-06-19 8:08 ` Gao feng
2012-06-19 8:12 ` Gao feng
2012-06-19 11:39 ` Pablo Neira Ayuso
2012-06-16 3:41 ` [PATCH net-next v2 07/12] netfilter: nf_conntrack_l4proto_udplite[4,6] cleanup Gao feng
2012-06-16 3:41 ` [PATCH net-next v2 08/12] netfilter: merge sctpv[4,6]_net_init into sctp_net_init Gao feng
2012-06-16 3:41 ` [PATCH net-next v2 09/12] netfilter: nf_conntrack_l4proto_generic cleanup Gao feng
2012-06-16 11:05 ` Pablo Neira Ayuso
2012-06-16 3:41 ` [PATCH net-next v2 10/12] netfilter: nf_conntrack_l4proto_dccp[4,6] cleanup Gao feng
2012-06-16 3:41 ` [PATCH net-next v2 11/12] netfilter: nf_conntrack_l4proto_icmp cleanup Gao feng
2012-06-16 11:08 ` Pablo Neira Ayuso
2012-06-19 8:14 ` Gao feng
2012-06-16 3:41 ` [PATCH net-next v2 12/12] netfilter: nf_conntrack_l4proto_icmpv6 cleanup Gao feng
2012-06-16 10:50 ` Pablo Neira Ayuso [this message]
2012-06-18 0:59 ` [PATCH net-next v2 01/12] netfilter: fix problem with proto register Gao feng
2012-06-18 9:06 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120616105037.GA18251@1984 \
--to=pablo@netfilter.org \
--cc=gaofeng@cn.fujitsu.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.