diff mbox series

[4.9,16/64] ceph: fix double unlock in handle_cap_export()

Message ID	20200526183918.707378282@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=+fRt=7I=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Wu Bo <wubo40@huawei.com>, "Yan, Zheng" <zyan@redhat.com>, Ilya Dryomov <idryomov@gmail.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 16/64] ceph: fix double unlock in handle_cap_export() Date: Tue, 26 May 2020 20:52:45 +0200 Message-Id: <20200526183918.707378282@linuxfoundation.org> In-Reply-To: <20200526183913.064413230@linuxfoundation.org> References: <20200526183913.064413230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,03/64] padata: get_next is never NULL [4.9,04/64] padata: ensure the reorder timer callback runs on the correct CPU [4.9,06/64] evm: Check also if *tfm is an error pointer in init_desc() [4.9,07/64] ima: Fix return value of ima_write_policy() [4.9,09/64] iommu/amd: Fix over-read of ACPI UID from IVRS table [4.9,12/64] HID: multitouch: add eGalaxTouch P80H84 support [4.9,13/64] configfs: fix config_item refcnt leak in configfs_rmdir() [4.9,16/64] ceph: fix double unlock in handle_cap_export() [4.9,17/64] USB: core: Fix misleading driver bug report [4.9,19/64] ARM: futex: Address build warning [4.9,21/64] padata: set cpu_index of unused CPUs to -1 [4.9,22/64] padata: Replace delayed timer with immediate workqueue in padata_reorder [4.9,25/64] arm64: fix the flush_icache_range arguments in machine_kexec [4.9,32/64] l2tp: remove useless duplicate session detection in l2tp_netlink [4.9,40/64] l2tp: hold tunnel while handling genl TUNNEL_GET commands [4.9,41/64] l2tp: hold tunnel used while creating sessions with netlink [4.9,43/64] l2tp: pass tunnel pointer to ->session_create() [4.9,44/64] l2tp: fix l2tp_eth module loading [4.9,45/64] l2tp: dont register sessions in l2tp_session_create() [4.9,46/64] l2tp: initialise l2tp_eth sessions before registering them [4.9,50/64] dmaengine: tegra210-adma: Fix an error handling path in tegra_adma_probe() [4.9,52/64] x86/uaccess, ubsan: Fix UBSAN vs. SMAP [4.9,53/64] ubsan: build ubsan.c more conservatively [4.9,55/64] libnvdimm/btt: Remove unnecessary code in btt_freelist_init [4.9,56/64] cxgb4: free mac_hlist properly [4.9,58/64] Revert "gfs2: Dont demote a glock until its revokes are written" [4.9,61/64] iio: dac: vf610: Fix an error handling path in vf610_dac_probe() [4.9,63/64] rapidio: fix an error in get_user_pages_fast() error handling [4.9,64/64] iio: sca3000: Remove an erroneous get_device()

Commit Message

Greg Kroah-Hartman May 26, 2020, 6:52 p.m. UTC

From: Wu Bo <wubo40@huawei.com>

[ 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 <wubo40@huawei.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/ceph/caps.c | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 617e9ae67f50..e11aacb35d6b 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -3394,6 +3394,7 @@  retry:
 		WARN_ON(1);
 		tsession = NULL;
 		target = -1;
+		mutex_lock(&session->s_mutex);
 	}
 	goto retry;