Patchwork [2/2,net-next] xfrm: fix a unbalanced lock

login
register
mail settings
Submitter roy.qing.li@gmail.com
Date Feb. 1, 2013, 5:17 a.m.
Message ID <1359695836-5666-2-git-send-email-roy.qing.li@gmail.com>
Download mbox | patch
Permalink /patch/217341/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

roy.qing.li@gmail.com - Feb. 1, 2013, 5:17 a.m.
From: Li RongQing <roy.qing.li@gmail.com> 

Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/xfrm/xfrm_output.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Steffen Klassert - Feb. 4, 2013, 8:12 a.m.
On Fri, Feb 01, 2013 at 01:17:16PM +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com> 
> 
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>

Applied to ipsec-next, but please add some more context to
your commit message next time.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 2c5aa8d..e894ac6 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);