From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8228C433E1 for ; Thu, 14 May 2020 19:06:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A06E92065F for ; Thu, 14 May 2020 19:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589483182; bh=5PTivwaPZ6auKnjEMpqk92qMygjZ8DRG+KWsa3Uy9ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CMZ8iXGhJ6+L/SVOkEOBbkX53GKuaq8SdBkwdFAUqK9WsHpbbjy4cwGV+CxUEygYm c/SXNxK5+ZHuH59BOchM45ykH80XeTSZEJGZTse0v3skSb8ZMoTGQ+hGBpw0aPbiBp OK76b6w/bnHP/t5XveKFgudyzOb7os6sRggCDqsE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729914AbgENTGL (ORCPT ); Thu, 14 May 2020 15:06:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:53382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728857AbgENSxv (ORCPT ); Thu, 14 May 2020 14:53:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5F8FA207DA; Thu, 14 May 2020 18:53:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482431; bh=5PTivwaPZ6auKnjEMpqk92qMygjZ8DRG+KWsa3Uy9ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nCMHXneZsOeqEYaYWurtr6fxeCBzNsFJaMgDDnjY7lFEszmy44IHOiXNQ5owaqFlY 4ilETnsHr+Tq50E0rxldfekn+6WBAorwUgeGpJzJqr7RruFalX7bQzZWiIU6mm9r7k QrZ43rp8IrdyxTkQwmrB6slPiMu6rgrlb7BL48tc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wu Bo , "Yan, Zheng" , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 32/49] ceph: fix double unlock in handle_cap_export() Date: Thu, 14 May 2020 14:52:53 -0400 Message-Id: <20200514185311.20294-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185311.20294-1-sashal@kernel.org> References: <20200514185311.20294-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wu Bo [ Upstream commit 4d8e28ff3106b093d98bfd2eceb9b430c70a8758 ] If the ceph_mdsc_open_export_target_session() return fails, it will do a "goto retry", but the session mutex has already been unlocked. Re-lock the mutex in that case to ensure that we don't unlock it twice. Signed-off-by: Wu Bo Reviewed-by: "Yan, Zheng" Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/caps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 703945cce0e5d..2d602c2b0ff68 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -3693,6 +3693,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, WARN_ON(1); tsession = NULL; target = -1; + mutex_lock(&session->s_mutex); } goto retry; -- 2.20.1