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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 3E4BDC10F03 for ; Fri, 22 Mar 2019 12:30:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 032362054F for ; Fri, 22 Mar 2019 12:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257857; bh=hU4XCE0T+csDNrAbczKLaLSUp3Wc69ICmnRt8kJCUJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iuZSh5Ec3uw7Bn8d1wr6JYufbCZ3I5z5nqnOTFa+U4XViRCQD1Baxjl9DdWTeeCcN hVeTpgpMDfk+NRsC85CFHW59s7S2AISHSjGOH+d3k/3RB2g5wyeSo2uqQf4RAHpiM/ xsEUK7beIrrAl2y4/U05PvLlpOSWxgg3ZMctu1Z8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390010AbfCVMSD (ORCPT ); Fri, 22 Mar 2019 08:18:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:56898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390440AbfCVMSA (ORCPT ); Fri, 22 Mar 2019 08:18:00 -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 B3E942083D; Fri, 22 Mar 2019 12:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553257079; bh=hU4XCE0T+csDNrAbczKLaLSUp3Wc69ICmnRt8kJCUJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rxR84wP9HlA9QvXiny8l2EwxDpoAHz3Cw/IKyOKv5H6zasq8XMZUNK6w2xWdoxvU3 cDaAooeu5zJhcDOJW/wPw/Q8Levv/RBXUFpTTlaOCcwyijqUTUhPJuy3FmAJyTaTtP K/1Dp7PSIDHneBHH22Lki8e+6SO2myhooJniRn6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anand Jain , Dan Carpenter , David Sterba Subject: [PATCH 5.0 094/238] btrfs: drop the lock on error in btrfs_dev_replace_cancel Date: Fri, 22 Mar 2019 12:15:13 +0100 Message-Id: <20190322111304.121747725@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111258.383569278@linuxfoundation.org> References: <20190322111258.383569278@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter commit 669e859b5ea7c6f4fce0149d3907c64e550c294b upstream. We should drop the lock on this error path. This has been found by a static tool. The lock needs to be released, it's there to protect access to the dev_replace members and is not supposed to be left locked. The value of state that's being switched would need to be artifically changed to an invalid value so the default: branch is taken. Fixes: d189dd70e255 ("btrfs: fix use-after-free due to race between replace start and cancel") CC: stable@vger.kernel.org # 5.0+ Reviewed-by: Anand Jain Signed-off-by: Dan Carpenter Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/dev-replace.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -862,6 +862,7 @@ int btrfs_dev_replace_cancel(struct btrf btrfs_destroy_dev_replace_tgtdev(tgt_device); break; default: + up_write(&dev_replace->rwsem); result = -EINVAL; }