From: Li RongQing <roy.qing.li@gmail.com>
Date: Fri, 1 Feb 2013 05:17:16 +0000 (+0800)
Subject: xfrm: fix a unbalanced lock
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fa8599db8f222fd9d351a640074377a841979187;p=openwrt%2Fstaging%2Fblogic.git

xfrm: fix a unbalanced lock

Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 3670526e70b9..bcfda8921b5b 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -64,7 +64,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 
 		if (unlikely(x->km.state != XFRM_STATE_VALID)) {
 			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATEINVALID);
-			goto error_nolock;
+			goto error;
 		}
 
 		err = xfrm_state_check_expire(x);