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 8D552C433DF for ; Thu, 14 May 2020 19:10:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6458220575 for ; Thu, 14 May 2020 19:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589483423; bh=ohwbQZY6QHdivKiazf0CJGB7g/yVODd2beXogKwiMJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cyiD30mzoUn9krWubl2oVzpJZ/PqkZmu6WFzLv1tci1rWKyhaMI2SKkd4fPgIsErI rPA+n8aIjhpaD1DEasq22aWzug2apuArFyw2GVhI8vUjGruVKTSSKV+4okuZO1/bOH MBRbTJhF5wpLezeccG2MzvC1T/QE8Hv61LkPmhiE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729212AbgENTKW (ORCPT ); Thu, 14 May 2020 15:10:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:50884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728374AbgENSwf (ORCPT ); Thu, 14 May 2020 14:52:35 -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 6E5892074A; Thu, 14 May 2020 18:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589482354; bh=ohwbQZY6QHdivKiazf0CJGB7g/yVODd2beXogKwiMJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ibtICn1zihKxZqkrK9ARlH3+F5Mw8wJBu6jea+n3eLRe7PjBy0nsPex8MYwTz7WiJ pklp0+eveJTStwPMEvaNopu0BC0my3rTupWo03YeKM6X8tLfEgVWZc12F8QS6N4bZQ xd2m/gtV5pHazuJ+PLJ/DRxvwj5a3h3Pq07OwZqA= 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.6 35/62] ceph: fix double unlock in handle_cap_export() Date: Thu, 14 May 2020 14:51:20 -0400 Message-Id: <20200514185147.19716-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514185147.19716-1-sashal@kernel.org> References: <20200514185147.19716-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 d050acc1fd5d9..f50204380a65d 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -3707,6 +3707,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