From: Gao feng <gaofeng@cn.fujitsu.com>
To: davem@davemloft.net
Cc: stephen.hemminger@vyatta.com, jengelh@inai.de,
eric.dumazet@gmail.com, kuznet@ms2.inr.ac.ru,
netdev@vger.kernel.org, Gao feng <gaofeng@cn.fujitsu.com>
Subject: [PATCH] inet_diag: fix panic when unload inet_diag
Date: Tue, 25 Sep 2012 10:48:30 +0800 [thread overview]
Message-ID: <1348541310-31913-1-git-send-email-gaofeng@cn.fujitsu.com> (raw)
when inet_diag being compiled as module, inet_diag_handler_dump
set netlink_dump_control.dump to inet_diag_dump,so if module
inet_diag is unloaded,netlink will still try to call this function
in netlink_dump. this will cause kernel panic.
fix this by adding a reference of inet_diag module before
setting netlink_callback, and release this reference in
netlink_callback.done.
Thanks for all help from Stephen,Jan and Eric.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
net/ipv4/inet_diag.c | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 570e61f..e573090 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -903,6 +903,12 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
return __inet_diag_dump(skb, cb, nlmsg_data(cb->nlh), bc);
}
+static int inet_diag_done(struct netlink_callback *cb)
+{
+ module_put(THIS_MODULE);
+ return 0;
+}
+
static inline int inet_diag_type2proto(int type)
{
switch (type) {
@@ -972,8 +978,26 @@ 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 = inet_diag_done,
};
- return netlink_dump_start(net->diag_nlsk, skb, nlh, &c);
+ int err;
+ /*
+ * netlink_dump will call inet_diag_dump_compat,
+ * so we need a reference of THIS_MODULE.
+ */
+ if (!try_module_get(THIS_MODULE))
+ return -EPROTONOSUPPORT;
+
+ err = netlink_dump_start(net->diag_nlsk, skb, nlh, &c);
+
+ if ((err != -EINTR) && (err != -ENOBUFS)) {
+ /*
+ * netlink_callback set failed, release the
+ * referenct of THIS_MODULE.
+ */
+ module_put(THIS_MODULE);
+ }
+ return err;
}
}
@@ -1001,8 +1025,26 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
{
struct netlink_dump_control c = {
.dump = inet_diag_dump,
+ .done = inet_diag_done,
};
- return netlink_dump_start(net->diag_nlsk, skb, h, &c);
+ int err;
+ /*
+ * netlink_dump will call inet_diag_dump,
+ * so we need a reference of THIS_MODULE.
+ */
+ if (!try_module_get(THIS_MODULE))
+ return -EPROTONOSUPPORT;
+
+ err = netlink_dump_start(net->diag_nlsk, skb, h, &c);
+
+ if ((err != -EINTR) && (err != -ENOBUFS)) {
+ /*
+ * netlink_callback set failed, release the
+ * referenct of THIS_MODULE.
+ */
+ module_put(THIS_MODULE);
+ }
+ return err;
}
}
--
1.7.7
next reply other threads:[~2012-09-25 3:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 2:48 Gao feng [this message]
2012-09-25 6:36 ` [PATCH] inet_diag: fix panic when unload inet_diag Eric Dumazet
2012-09-25 7:20 ` Gao feng
2012-09-25 7:27 ` 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=1348541310-31913-1-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=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.org \
--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).