All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ying Xue <ying.xue@windriver.com>
To: <davem@davemloft.net>, <ktkhai@virtuozzo.com>, <jon.maloy@ericsson.com>
Cc: <netdev@vger.kernel.org>, <syzkaller-bugs@googlegroups.com>,
	<tipc-discussion@lists.sourceforge.net>
Subject: [PATCH net v4 6/7] tipc: Introduce __tipc_nl_net_set
Date: Wed, 14 Feb 2018 13:38:03 +0800	[thread overview]
Message-ID: <1518586684-12307-7-git-send-email-ying.xue@windriver.com> (raw)
In-Reply-To: <1518586684-12307-1-git-send-email-ying.xue@windriver.com>

Introduce __tipc_nl_net_set() which doesn't hold RTNL lock.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
---
 net/tipc/net.c | 15 ++++++++++++---
 net/tipc/net.h |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 719c592..1a2fde0 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -200,7 +200,7 @@ int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb)
 	return skb->len;
 }
 
-int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info)
+int __tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info)
 {
 	struct net *net = sock_net(skb->sk);
 	struct tipc_net *tn = net_generic(net, tipc_net_id);
@@ -241,10 +241,19 @@ int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info)
 		if (!tipc_addr_node_valid(addr))
 			return -EINVAL;
 
-		rtnl_lock();
 		tipc_net_start(net, addr);
-		rtnl_unlock();
 	}
 
 	return 0;
 }
+
+int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info)
+{
+	int err;
+
+	rtnl_lock();
+	err = __tipc_nl_net_set(skb, info);
+	rtnl_unlock();
+
+	return err;
+}
diff --git a/net/tipc/net.h b/net/tipc/net.h
index c7c2549..c0306aa 100644
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@@ -47,5 +47,6 @@ void tipc_net_stop(struct net *net);
 
 int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb);
 int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info);
+int __tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info);
 
 #endif
-- 
2.7.4

  parent reply	other threads:[~2018-02-14  5:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-14  5:37 [PATCH net v4 0/7] tipc: Fix missing RTNL lock protection during setting link properties Ying Xue
2018-02-14  5:37 ` [PATCH net v4 1/7] tipc: Refactor __tipc_nl_compat_doit Ying Xue
2018-02-14  5:37 ` [PATCH net v4 2/7] tipc: Introduce __tipc_nl_bearer_disable Ying Xue
2018-02-14  5:38 ` [PATCH net v4 3/7] tipc: Introduce __tipc_nl_bearer_enable Ying Xue
2018-02-14  5:38 ` [PATCH net v4 4/7] tipc: Introduce __tipc_nl_bearer_set Ying Xue
2018-02-14  5:38 ` [PATCH net v4 5/7] tipc: Introduce __tipc_nl_media_set Ying Xue
2018-02-14  5:38 ` Ying Xue [this message]
2018-02-14  5:38 ` [PATCH net v4 7/7] tipc: Fix missing RTNL lock protection during setting link properties Ying Xue
2018-02-14 10:16   ` Kirill Tkhai
2018-02-14 19:46 ` [PATCH net v4 0/7] " David Miller

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=1518586684-12307-7-git-send-email-ying.xue@windriver.com \
    --to=ying.xue@windriver.com \
    --cc=davem@davemloft.net \
    --cc=jon.maloy@ericsson.com \
    --cc=ktkhai@virtuozzo.com \
    --cc=netdev@vger.kernel.org \
    --cc=syzkaller-bugs@googlegroups.com \
    --cc=tipc-discussion@lists.sourceforge.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.