Re: [patch v2 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink module to netlink_dump_start
From: Gao feng <hidden>
Date: 2012-09-26 09:25:28
Also in:
linux-rdma, netdev, netfilter-devel
From: Gao feng <hidden>
Date: 2012-09-26 09:25:28
Also in:
linux-rdma, netdev, netfilter-devel
于 2012年09月26日 16:41, Gao feng 写道:
use proper netlink_dump_control.done and .module to avoid panic. Signed-off-by: Gao feng <redacted> --- 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.