From patchwork Wed Sep 26 04:52:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao feng X-Patchwork-Id: 1507481 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7C87ADF238 for ; Wed, 26 Sep 2012 04:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829Ab2IZExS (ORCPT ); Wed, 26 Sep 2012 00:53:18 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:36248 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751887Ab2IZEw7 (ORCPT ); Wed, 26 Sep 2012 00:52:59 -0400 X-IronPort-AV: E=Sophos;i="4.80,487,1344182400"; d="scan'208";a="5917571" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 26 Sep 2012 12:51:22 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q8Q4qd5X029291; Wed, 26 Sep 2012 12:52:41 +0800 Received: from Donkey.fnst.cn.fujitsu.com ([10.167.225.206]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012092612525389-77187 ; Wed, 26 Sep 2012 12:52:53 +0800 From: Gao feng To: davem@davemloft.net Cc: netfilter-devel@vger.kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, eric.dumazet@gmail.com, pablo@netfilter.org, steffen.klassert@secunet.com, linux-crypto@vger.kernel.org, jengelh@inai.de, stephen.hemminger@vyatta.com, Gao feng , Jozsef Kadlecsik Subject: [PATCH 10/11] ipset: pass ipset module to netlink_dump_start Date: Wed, 26 Sep 2012 12:52:19 +0800 Message-Id: <1348635140-20225-10-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1348635140-20225-1-git-send-email-gaofeng@cn.fujitsu.com> References: <1348635140-20225-1-git-send-email-gaofeng@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/09/26 12:52:53, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/09/26 12:52:55, Serialize complete at 2012/09/26 12:52:55 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 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 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 9730882..4c9c892 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -986,6 +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]); } + netlink_dump_done(cb); return 0; } @@ -1176,6 +1177,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); }