From: Gao feng <gaofeng@cn.fujitsu.com>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: davem@davemloft.net, eric.dumazet@gmail.com,
steffen.klassert@secunet.com, netfilter-devel@vger.kernel.org,
linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
linux-crypto@vger.kernel.org, pablo@netfilter.org,
stephen.hemminger@vyatta.com, jengelh@inai.de
Subject: Re: [patch v2 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink module to netlink_dump_start
Date: Wed, 26 Sep 2012 17:25:26 +0800 [thread overview]
Message-ID: <5062CA06.5070408@cn.fujitsu.com> (raw)
In-Reply-To: <1348648888-24943-4-git-send-email-gaofeng@cn.fujitsu.com>
于 2012年09月26日 16:41, Gao feng 写道:
> use proper netlink_dump_control.done and .module to avoid panic.
>
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
> net/netfilter/nf_conntrack_netlink.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
> index 9807f32..509a257 100644
> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@ -706,6 +706,7 @@ static int ctnetlink_done(struct netlink_callback *cb)
> nf_ct_put((struct nf_conn *)cb->args[1]);
> if (cb->data)
> kfree(cb->data);
> + netlink_dump_done(cb);
> return 0;
> }
>
> @@ -1022,6 +1023,7 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
> struct netlink_dump_control c = {
> .dump = ctnetlink_dump_table,
> .done = ctnetlink_done,
> + .module = THIS_MODULE,
> };
> #ifdef CONFIG_NF_CONNTRACK_MARK
> if (cda[CTA_MARK] && cda[CTA_MARK_MASK]) {
> @@ -1706,6 +1708,8 @@ ctnetlink_stat_ct_cpu(struct sock *ctnl, struct sk_buff *skb,
> if (nlh->nlmsg_flags & NLM_F_DUMP) {
> struct netlink_dump_control c = {
> .dump = ctnetlink_ct_stat_cpu_dump,
> + .done = netlink_dump_done,
> + .module = THIS_MODULE,
> };
> return netlink_dump_start(ctnl, skb, nlh, &c);
> }
> @@ -2141,6 +2145,7 @@ static int ctnetlink_exp_done(struct netlink_callback *cb)
> {
> if (cb->args[1])
> nf_ct_expect_put((struct nf_conntrack_expect *)cb->args[1]);
> + netlink_dump_done(cb);
> return 0;
> }
I should do return netlink_dump_done here.
I will reset this patchset.
next prev parent reply other threads:[~2012-09-26 9:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 8:41 [patch v2 01/11] netlink: add reference of module in netlink_dump_start Gao feng
2012-09-26 8:41 ` [patch v2 02/11] inet_diag: pass inet_diag module to netlink_dump_start Gao feng
2012-09-26 8:41 ` [patch v2 03/11] unix_diag: pass unix_diag " Gao feng
2012-09-26 8:41 ` [patch v2 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink " Gao feng
2012-09-26 9:25 ` Gao feng [this message]
2012-09-26 9:26 ` Pablo Neira Ayuso
2012-09-26 9:42 ` Gao feng
2012-09-26 9:58 ` Pablo Neira Ayuso
2012-09-26 12:35 ` Gao feng
[not found] ` <5062F6A9.7020309-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-09-26 15:04 ` Pablo Neira Ayuso
2012-09-27 0:14 ` Gao feng
2012-09-26 8:41 ` [patch v2 05/11] nfnetlink_acct: pass nfnetlink_acct " Gao feng
2012-09-26 8:41 ` [patch v2 08/11] crypto: pass crypto_user " Gao feng
2012-09-26 8:41 ` [patch v2 09/11] xfrm: pass xfrm_user " Gao feng
[not found] ` <1348648888-24943-1-git-send-email-gaofeng-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-09-26 8:41 ` [patch v2 06/11] nfnetlink_cthelper: pass nfnetlink_cthelper " Gao feng
2012-09-26 8:41 ` [patch v2 07/11] nfnetlink_cttimeout: pass nfnetlink_cttimeout " Gao feng
2012-09-26 8:41 ` [patch v2 10/11] ipset: pass ipset " Gao feng
2012-09-26 8:41 ` [patch v2 11/11] infiniband: pass rdma_cm " Gao feng
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=5062CA06.5070408@cn.fujitsu.com \
--to=gaofeng@cn.fujitsu.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=jengelh@inai.de \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=steffen.klassert@secunet.com \
--cc=stephen.hemminger@vyatta.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).