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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 EDBF3C433E0 for ; Tue, 26 May 2020 18:56:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4FE62086A for ; Tue, 26 May 2020 18:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519392; bh=HuOdOjWhh7v+oy4B89jHnnSfzG+CFqbTWXFEPAFgzas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2WAluzzDMhBDA7Ff8ImLlzx2yusboQRqrxtqC5B0Gzcd2hcQxJE6duHE518Xlzz6H Mx3bcmfZvnIieQajInf98x04rrBOKBCik1UPNLVUA8cziFuppNLcaMRBStI3KlzYLy 2mbMirNXDFkpfChjscHRjUdTA0vXqa73MGpeS5JY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389863AbgEZS4c (ORCPT ); Tue, 26 May 2020 14:56:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:49364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388211AbgEZS4b (ORCPT ); Tue, 26 May 2020 14:56:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 73F5020849; Tue, 26 May 2020 18:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519390; bh=HuOdOjWhh7v+oy4B89jHnnSfzG+CFqbTWXFEPAFgzas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c0whXinoq+cCIXYA3UMHtcGYYyK2kgsPbYS2NnzkS+pJNrNBj2B7QHC8fL7CCpy40 3URXZ/hAIzRU/1RNHBEH3ZAPHpR7nsWSr17THvQl3T5A3gP/8yo6pYOduJXPSt43eX iwYAII0VSDGSsmtfRDZjabdwNerrwTmN4Dq08Lbg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wu Bo , "Yan, Zheng" , Ilya Dryomov , Sasha Levin Subject: [PATCH 4.4 09/65] ceph: fix double unlock in handle_cap_export() Date: Tue, 26 May 2020 20:52:28 +0200 Message-Id: <20200526183909.708689116@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183905.988782958@linuxfoundation.org> References: <20200526183905.988782958@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 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 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; -- 2.25.1