Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp620778img; Fri, 22 Mar 2019 05:18:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzsDS4OoziLlxdT1qHibnmZ8kX+zl9BgXl7ua+FnxHwx1mp69J6csCq68hNU3jjxAn6INez X-Received: by 2002:a17:902:e60e:: with SMTP id cm14mr9236220plb.192.1553257134462; Fri, 22 Mar 2019 05:18:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553257134; cv=none; d=google.com; s=arc-20160816; b=n0MA8vdcBkvgqFLLA7GuQ+0FSGqPE8N/QV1PBT1EVLW3zIpG4PVf6PCpn+niKRx2N4 hHk22tmBTgbf4vpX9fOCf9G6Jib5eNDBr/vtKiQqMclc+6pLPXV7UbGDw+rnwtUY3B81 mIxvJVGOxN1RtHVTVwtpA/H2R1e3gMqbX5xyBbsxDz8VHuC4ID4Jm3eqp5MweUPZaC1j kXASXNdTgud7NGaGbZulgw6fUY2ZTT9fOCLjGmSesMLv/SfqPMAU97Z/VQ6hLC8kE/Za ed5D0Zdqvlw3rcfffIcB7BhTdLQXa2Nd6cemtTIfVDwUtZmStjX+ZkRQgOy+w42s83d2 NmhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zC4Nmmo2NnChpjQPDdndOkauahjXP+10qfLL6CAyIOQ=; b=WbNXik3U7XmGpNDZiKxgTZ0wIfLayShTeBX8XGc5AHwO4cQdonXnIIXSmqoyDF+6kg 7UocbbygK6brvzx+q46oR0b/XelrMz1dTp/h3EMTOOdpWhkgtTQUQxtfTnSpatqyv/9Z 2+iL1a/Ca/jswOTcSbjvoybF1CrjyFKUiDgvo37LSwZulkxBdPpx/7SKS92VZrckUjqx U1qDmGcBL27MmR5k0niZONIVr2gT8Z3blSDW5HzphkfiJwfilkLh7Xm3rS9TogzfDH/6 Yx4Im8RhLeubXQyHkNe+9Vpgipj9ejOWLW7t6ewoP+qrB0lM1Ayq/fqdX73w9Dt8JX4P B69g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rxR84wP9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n1si7072940pld.251.2019.03.22.05.18.39; Fri, 22 Mar 2019 05:18:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rxR84wP9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390239AbfCVMSE (ORCPT + 99 others); Fri, 22 Mar 2019 08:18:04 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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; }