From: Gao feng <gaofeng@cn.fujitsu.com>
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 <gaofeng@cn.fujitsu.com>
Subject: [PATCH 02/11] inet_diag: pass inet_diag module to netlink_dump_start
Date: Wed, 26 Sep 2012 12:52:11 +0800 [thread overview]
Message-ID: <1348635140-20225-2-git-send-email-gaofeng@cn.fujitsu.com> (raw)
In-Reply-To: <1348635140-20225-1-git-send-email-gaofeng@cn.fujitsu.com>
use proper netlink_dump_control.done and .module to avoid panic.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
net/ipv4/inet_diag.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 570e61f..36d4be5 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -972,6 +972,8 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
{
struct netlink_dump_control c = {
.dump = inet_diag_dump_compat,
+ .done = netlink_dump_done,
+ .module = THIS_MODULE,
};
return netlink_dump_start(net->diag_nlsk, skb, nlh, &c);
}
@@ -1001,6 +1003,8 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
{
struct netlink_dump_control c = {
.dump = inet_diag_dump,
+ .done = netlink_dump_done,
+ .module = THIS_MODULE,
};
return netlink_dump_start(net->diag_nlsk, skb, h, &c);
}
--
1.7.7.6
next prev parent reply other threads:[~2012-09-26 4:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 4:52 [PATCH 01/11] netlink: add reference of module in netlink_dump_start Gao feng
2012-09-26 4:52 ` Gao feng [this message]
2012-09-26 16:07 ` [PATCH 02/11] inet_diag: pass inet_diag module to netlink_dump_start Stephen Hemminger
[not found] ` <20120926090714.618a4b39-We1ePj4FEcvRI77zikRAJc56i+j3xesD0e7PPNI6Mm0@public.gmane.org>
2012-09-26 17:26 ` Pablo Neira Ayuso
2012-09-26 4:52 ` [PATCH 03/11] unix_diag: pass unix_diag " Gao feng
2012-09-26 4:52 ` [PATCH 04/11] nf_conntrack_netlink: pass nf_conntrack_netlink " Gao feng
2012-09-26 4:52 ` [PATCH 05/11] nfnetlink_acct: pass nfnetlink_acct " Gao feng
2012-09-26 4:52 ` [PATCH 06/11] nfnetlink_cthelper: pass nfnetlink_cthelper " Gao feng
2012-09-26 4:52 ` [PATCH 07/11] nfnetlink_cttimeout: pass nfnetlink_cttimeout " Gao feng
2012-09-26 4:52 ` [PATCH 08/11] crypto: pass crypto_user " Gao feng
[not found] ` <1348635140-20225-8-git-send-email-gaofeng-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-09-26 5:49 ` Steffen Klassert
2012-09-26 7:21 ` Gao feng
2012-09-26 4:52 ` [PATCH 09/11] xfrm: pass xfrm_user " Gao feng
2012-09-26 4:52 ` [PATCH 11/11] infiniband: pass rdma_cm " Gao feng
2012-09-26 5:41 ` [PATCH 01/11] netlink: add reference of module in netlink_dump_start Steffen Klassert
[not found] ` <20120926054102.GD4221-opNxpl+3fjRBDgjK7y7TUQ@public.gmane.org>
2012-09-26 6:05 ` Gao feng
[not found] ` <1348635140-20225-1-git-send-email-gaofeng-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2012-09-26 4:52 ` [PATCH 10/11] ipset: pass ipset module to netlink_dump_start Gao feng
2012-09-26 7:07 ` [PATCH 01/11] netlink: add reference of module in netlink_dump_start Eric Dumazet
2012-09-26 7:24 ` Gao feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348635140-20225-2-git-send-email-gaofeng@cn.fujitsu.com \
--to=gaofeng@cn.fujitsu.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=jengelh@inai.de \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=steffen.klassert@secunet.com \
--cc=stephen.hemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).