From patchwork Tue May 26 18:52:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 225413 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 B7D0AC433DF for ; Tue, 26 May 2020 18:57:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8EF882084C for ; Tue, 26 May 2020 18:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519473; bh=cO2riDSx2jLAx5ZL8lJ5UDHZRjMrSl2uLHgV3V/L+vY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N5A+aQom7AVtipUjXZKiO9vzxAE+gMMedQfldYtPOB8LO2NfT0i7+JG7+9k02m+AB EV+pwJvERGgNuncfw8O/yW96ktiXYxHe/rQ7PDgYEbQugqnieVahT/EM8QMzf4OlpX qenomIO4pAx8z9locU4sytn3I3A8TIxySbp9dclM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389442AbgEZS5w (ORCPT ); Tue, 26 May 2020 14:57:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:51138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390185AbgEZS5t (ORCPT ); Tue, 26 May 2020 14:57:49 -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 18580214D8; Tue, 26 May 2020 18:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519469; bh=cO2riDSx2jLAx5ZL8lJ5UDHZRjMrSl2uLHgV3V/L+vY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DnvDKKZ1t7HPySMzx7uqmv99ANv1cIMXtdJAKg2LLdilIFcQ11W3h4G1zNMyGjqsL /4BIWtjQHPOmaCs+2T0gqYir1c6jFMwZGytVmf2UY18aIspeNJeQUVA1JhmCEsRAAt QPIQ46Iv5U2cyOQD0jxh1KENzuF+zD81Vm1RXoEs= 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.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> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183913.064413230@linuxfoundation.org> References: <20200526183913.064413230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 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;