From patchwork Wed Sep 26 08:41:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,10/11] ipset: pass ipset module to netlink_dump_start From: Gao feng X-Patchwork-Id: 187001 Message-Id: <1348648888-24943-10-git-send-email-gaofeng@cn.fujitsu.com> To: davem@davemloft.net, eric.dumazet@gmail.com, steffen.klassert@secunet.com Cc: 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, Gao feng , Jozsef Kadlecsik Date: Wed, 26 Sep 2012 16:41:27 +0800 use proper netlink_dump_control.done and .module to avoid panic. Signed-off-by: Gao feng Cc: Jozsef Kadlecsik --- net/netfilter/ipset/ip_set_core.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 9730882..c4903dc 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -986,7 +986,7 @@ ip_set_dump_done(struct netlink_callback *cb) pr_debug("release set %s\n", ip_set_list[cb->args[1]]->name); ip_set_put_byindex((ip_set_id_t) cb->args[1]); } - return 0; + return netlink_dump_done(cb); } static inline void @@ -1176,6 +1176,7 @@ ip_set_dump(struct sock *ctnl, struct sk_buff *skb, struct netlink_dump_control c = { .dump = ip_set_dump_start, .done = ip_set_dump_done, + .module = THIS_MODULE, }; return netlink_dump_start(ctnl, skb, nlh, &c); }