summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorWu Bo <wubo40@huawei.com>2020-04-30 14:12:49 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-27 16:40:24 +0200
commitf12bf0d048c281e9a2c2e69f1e41fbff4337dcea (patch)
tree1216a1f749867f7ded8a4717b6c06947201e0b90 /fs
parent2614ff6557d5d3170cb58644754b839302d67e69 (diff)
ceph: fix double unlock in handle_cap_export()
[ 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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/caps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index efdf81ea3b5f..3d0497421e62 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -3293,6 +3293,7 @@ retry:
WARN_ON(1);
tsession = NULL;
target = -1;
+ mutex_lock(&session->s_mutex);
}
goto retry;