netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] fou: Fix missing unlock on error in fou_nl_dump()
@ 2015-04-16 12:14 weiyj_lk
  2015-04-16 16:11 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2015-04-16 12:14 UTC (permalink / raw)
  To: David S. Miller, Alexey Kuznetsov, James Morris,
	Hideaki YOSHIFUJI, Patrick McHardy, WANG Cong
  Cc: Wei Yongjun, netdev

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Add the missing unlock before return from function fou_nl_dump()
in the error handling case.

Fixes: 7a6c8c34e5b7 (fou: implement FOU_CMD_GET)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 net/ipv4/fou.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index af150b4..6ca0182 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -711,7 +711,7 @@ static int fou_nl_dump(struct sk_buff *skb, struct netlink_callback *cb)
 				    cb->nlh->nlmsg_seq, NLM_F_MULTI,
 				    skb, FOU_CMD_GET);
 		if (ret)
-			goto done;
+			break;
 	}
 	mutex_unlock(&fn->fou_lock);
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] fou: Fix missing unlock on error in fou_nl_dump()
  2015-04-16 12:14 [PATCH -next] fou: Fix missing unlock on error in fou_nl_dump() weiyj_lk
@ 2015-04-16 16:11 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-04-16 16:11 UTC (permalink / raw)
  To: weiyj_lk
  Cc: kuznet, jmorris, yoshfuji, kaber, xiyou.wangcong, yongjun_wei,
	netdev

From: weiyj_lk@163.com
Date: Thu, 16 Apr 2015 20:14:39 +0800

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Add the missing unlock before return from function fou_nl_dump()
> in the error handling case.
> 
> Fixes: 7a6c8c34e5b7 (fou: implement FOU_CMD_GET)
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Your patch adds a warning because you fail to remove the 'done'
label which is no longer used.

Cong Wang already submitted a patch which does remove the 'done'
field properly, so I will apply his version.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-16 16:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-16 12:14 [PATCH -next] fou: Fix missing unlock on error in fou_nl_dump() weiyj_lk
2015-04-16 16:11 ` David Miller

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).