From patchwork Fri Feb 1 05:17:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li RongQing X-Patchwork-Id: 217341 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A4EE22C0297 for ; Fri, 1 Feb 2013 16:17:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751384Ab3BAFRo (ORCPT ); Fri, 1 Feb 2013 00:17:44 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:62829 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751040Ab3BAFRm (ORCPT ); Fri, 1 Feb 2013 00:17:42 -0500 Received: by mail-pa0-f46.google.com with SMTP id kp14so2090538pab.19 for ; Thu, 31 Jan 2013 21:17:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=oAOjUi1KC1PTnFCDuiRzVmkFZOIvoi3ZI+5vuULxtoc=; b=hD2rVGlvWb/ae8yIMy7kZDM5HXEW9IjlPZ6HWTx80Tdj//8vObaiJfoDUz6OdJ3XyR 2Skm6T0NkFUjoOG/T4FMFo4qsn0MkQF7tbdjJuqGLMYJB756W0dnM9Y9IN/PRurk3OGZ PQE1TXXPkpFaWKGGyp9kQpQIudEhp11em1tI5HIdTUoB2kZUKRpfaDfZdq7ZvpdiIfNF 84UzWgwGygt0Nt8Tpda9yrguP+wsWiOvhFAb4ERn55axBXUlmJfj4SYt37Y9yffLxus9 ZiWKV55yHbscrhOgecr15Hi+6CRLCm8ApGdYLgjP3hKpPttENDlOyH/RuDvp3kPlNUht U6Tw== X-Received: by 10.68.229.169 with SMTP id sr9mr28617184pbc.120.1359695862438; Thu, 31 Jan 2013 21:17:42 -0800 (PST) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id ai8sm7247958pbd.14.2013.01.31.21.17.38 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 31 Jan 2013 21:17:41 -0800 (PST) From: roy.qing.li@gmail.com To: netdev@vger.kernel.org, steffen.klassert@secunet.com Subject: [PATCH 2/2 net-next] xfrm: fix a unbalanced lock Date: Fri, 1 Feb 2013 13:17:16 +0800 Message-Id: <1359695836-5666-2-git-send-email-roy.qing.li@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359695836-5666-1-git-send-email-roy.qing.li@gmail.com> References: <1359695836-5666-1-git-send-email-roy.qing.li@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li RongQing Signed-off-by: Li RongQing --- net/xfrm/xfrm_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);