Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1336576 > unrolled thread

[PATCH] tipc: unlock in error path

Back to article view | Back to linux.kernel

Contents

  [PATCH] tipc: unlock in error path Insu Yun <wuninsu@gmail.com> - 2016-02-17 17:50 +0100
    RE: [PATCH] tipc: unlock in error path "Xue, Ying" <Ying.Xue@windriver.com> - 2016-02-18 14:20 +0100
    Re: [PATCH] tipc: unlock in error path David Miller <davem@davemloft.net> - 2016-02-19 21:50 +0100

#1336576 — [PATCH] tipc: unlock in error path

tipc_bcast_unlock need to be unlocked in error path.

Signed-off-by: Insu Yun <wuninsu@gmail.com>
---
 net/tipc/link.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 0c2944f..347cdc9 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1973,8 +1973,10 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg)
 
 	hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
 			  NLM_F_MULTI, TIPC_NL_LINK_GET);
-	if (!hdr)
+	if (!hdr) {
+		tipc_bcast_unlock(net);
 		return -EMSGSIZE;
+	}
 
 	attrs = nla_nest_start(msg->skb, TIPC_NLA_LINK);
 	if (!attrs)
-- 
1.9.1

[toc] | [next] | [standalone]

#1337346

Acked-by: Ying Xue  <ying.xue@windriver.com>

-----Original Message-----
From: Insu Yun [mailto:wuninsu@gmail.com] 
Sent: 2016年2月18日 0:48
To: jon.maloy@ericsson.com; Xue, Ying; davem@davemloft.net; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; linux-kernel@vger.kernel.org
Cc: taesoo@gatech.edu; yeongjin.jang@gatech.edu; insu@gatech.edu; changwoo@gatech.edu; Insu Yun
Subject: [PATCH] tipc: unlock in error path

tipc_bcast_unlock need to be unlocked in error path.

Signed-off-by: Insu Yun <wuninsu@gmail.com>
---
 net/tipc/link.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/tipc/link.c b/net/tipc/link.c index 0c2944f..347cdc9 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1973,8 +1973,10 @@ int tipc_nl_add_bc_link(struct net *net, struct tipc_nl_msg *msg)
 
 	hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
 			  NLM_F_MULTI, TIPC_NL_LINK_GET);
-	if (!hdr)
+	if (!hdr) {
+		tipc_bcast_unlock(net);
 		return -EMSGSIZE;
+	}
 
 	attrs = nla_nest_start(msg->skb, TIPC_NLA_LINK);
 	if (!attrs)
--
1.9.1

[toc] | [prev] | [next] | [standalone]

#1338451

From: Insu Yun <wuninsu@gmail.com>
Date: Wed, 17 Feb 2016 11:47:35 -0500

> tipc_bcast_unlock need to be unlocked in error path.
> 
> Signed-off-by: Insu Yun <wuninsu@gmail.com>

Applied.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web