Re: [patch v2 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink module to netlink_dump_start
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: 2012-09-26 09:26:32
Also in:
linux-crypto, linux-rdma, netfilter-devel
On Wed, Sep 26, 2012 at 04:41:21PM +0800, Gao feng wrote:
quoted hunk ↗ jump to hunk
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);
I think you can call netlink_dump_done from af_netlink.c:
static int netlink_dump(struct sock *sk)
...
if (cb->done) {
cb->done(cb);
netlink_dump_done(...);
}
Thus, you don't need to change netlink_dump_control in every netlink
subsystem.
quoted hunk ↗ jump to hunk
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,
You can do something similar to: 9f00d97 netlink: hide struct module parameter in netlink_kernel_create by definiting netlink_dump_start as static inline and using THIS_MODULE from there. If I'm not missing anything, with those two changes, you will not need to modify any caller and it will result one single patch.