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 11/12] netfilter: nf_conntrack_l4proto_icmp cleanup
Date: Sat, 16 Jun 2012 13:08:28 +0200 [thread overview]
Message-ID: <20120616110828.GE18251@1984> (raw)
In-Reply-To: <1339818083-31356-11-git-send-email-gaofeng@cn.fujitsu.com>
On Sat, Jun 16, 2012 at 11:41:22AM +0800, Gao feng wrote:
> add two functions icmp_kmemdup_sysctl_table and
> icmp_kmemdup_compat_sysctl_table to make codes more
> clearer.
>
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
> net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 44 ++++++++++++++++++++-----
> 1 files changed, 35 insertions(+), 9 deletions(-)
>
> diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
> index 76f7a2f..be7ae4c 100644
> --- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
> +++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
> @@ -337,34 +337,60 @@ static struct ctl_table icmp_compat_sysctl_table[] = {
> #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
> #endif /* CONFIG_SYSCTL */
>
> -static int icmp_init_net(struct net *net, u_int16_t proto)
> +static int icmp_kmemdup_sysctl_table(struct nf_proto_net *pn)
> {
> - struct nf_icmp_net *in = icmp_pernet(net);
> - struct nf_proto_net *pn = (struct nf_proto_net *)in;
> - in->timeout = nf_ct_icmp_timeout;
> -
> #ifdef CONFIG_SYSCTL
> + struct nf_icmp_net *in = (struct nf_icmp_net *)pn;
> +
> pn->ctl_table = kmemdup(icmp_sysctl_table,
> sizeof(icmp_sysctl_table),
> GFP_KERNEL);
> if (!pn->ctl_table)
> return -ENOMEM;
> +
> pn->ctl_table[0].data = &in->timeout;
> +#endif
> + return 0;
> +}
> +
> +static int icmp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn)
> +{
> +#ifdef CONFIG_SYSCTL
> #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
> + struct nf_icmp_net *in = (struct nf_icmp_net *)pn;
> +
> pn->ctl_compat_table = kmemdup(icmp_compat_sysctl_table,
> sizeof(icmp_compat_sysctl_table),
> GFP_KERNEL);
> - if (!pn->ctl_compat_table) {
> - kfree(pn->ctl_table);
> - pn->ctl_table = NULL;
> + if (!pn->ctl_compat_table)
> return -ENOMEM;
> - }
> +
> pn->ctl_compat_table[0].data = &in->timeout;
> #endif
> #endif
> return 0;
> }
>
> +
extra line unrequiered.
I'm sorry, I'm stressing a lot on this because I don't like abusing
follow-up patches that clean up extra lines / missing lines and that
sort of nitpicks...
> +static int icmp_init_net(struct net *net, u_int16_t proto)
> +{
> + int ret;
> + struct nf_icmp_net *in = icmp_pernet(net);
> + struct nf_proto_net *pn = &in->pn;
> +
> + in->timeout = nf_ct_icmp_timeout;
> +
> + ret = icmp_kmemdup_compat_sysctl_table(pn);
> + if (ret < 0)
> + return ret;
> +
> + ret = icmp_kmemdup_sysctl_table(pn);
> + if (ret < 0)
> + nf_ct_kfree_compat_sysctl_table(pn);
> +
> + return ret;
> +}
> +
> struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =
> {
> .l3proto = PF_INET,
> --
> 1.7.7.6
>
> --
> 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
next prev parent reply other threads:[~2012-06-16 11:08 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 [this message]
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 ` [PATCH net-next v2 01/12] netfilter: fix problem with proto register Pablo Neira Ayuso
2012-06-18 0:59 ` 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=20120616110828.GE18251@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.