Patchwork [v2,10/11] ipset: pass ipset module to netlink_dump_start

login
register
mail settings
Submitter Gao feng
Date Sept. 26, 2012, 8:41 a.m.
Message ID <1348648888-24943-10-git-send-email-gaofeng@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/187001/
State Not Applicable
Headers show

Comments

Gao feng - Sept. 26, 2012, 8:41 a.m.
use proper netlink_dump_control.done and .module to avoid panic.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---
 net/netfilter/ipset/ip_set_core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

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);
 	}