Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4564604imu; Tue, 29 Jan 2019 03:54:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN5wncqOCRKwIxqdsaJoDmVQk5ksnSxSqWKKt1j5amuI1c3AEl14E5N0QCzef7NkjOvO2zsF X-Received: by 2002:a63:8742:: with SMTP id i63mr23171330pge.298.1548762857422; Tue, 29 Jan 2019 03:54:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548762857; cv=none; d=google.com; s=arc-20160816; b=y8nLfl1USXoKMQYbww/u5jSo7FrdBm1yhOfBVHhYoRkIM5HfhU/FKi9c4uE6O5auXz 9HwrmuZBw6AZO+umZ1oPAGB+0hiUbqPBpz2W7nRfJOZrB+Pwh3eD4hEcav9sFtdnrhOs pcUmMWbYEs6wtgago+1Q8Vm1hRdM0NfNFSKvnFfG0U4Fbu9xs+M0D2hSDtlBLWrySa9Y 9srw5ApNNAsjiuJ+qqxuqX0F+8fOYuUWw+T5PnKNUfd2RLXaOgXpsuCnOuBC86MboRJ8 zulwMEDoOz9jRVItQfZ7Lkw4LYSOclomZQh59g6z4JqopVAdhBFlxLr7rZpKmr9eClDz V6MQ== 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=I2I0rXbBK9cQBp8RqfpM0DWIuJKRsawmU7snmN+aOrw=; b=tTTmqvBtJ2rOdsRJaTrwbSo0xSMz4ShsMOm4JpRj7NXRavYKUlcqAC7EbaUMNC/hgU 3N1KklYheYJ4dgzhKunv2qzhNu5kbPU+7vP+lgZMnFJXX8G7tPOeidD/baPWbuYGy5Yd 5+lt4shAoPTSlZWshQyNJQH+hyu6DFMxRML6yGD0BHqyo3K4J9DjLW43NLwVNPgp9ufz 7F4BEZqM+PZSnIdJ8ZX0B+vobeciPxbJfokC1vTaIJe967AbqBJEOJDt9GGXgcmaUFEk H9U4x2CNpe2XzHGijKIaiOj1M2YlmKAerD/n3IQMX5cgofH0rArswHg/nlxTSg6HOpev kS3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j8Mn1Sht; 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 k26si5326992pgb.72.2019.01.29.03.54.01; Tue, 29 Jan 2019 03:54:17 -0800 (PST) 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=j8Mn1Sht; 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 S1732096AbfA2Lw2 (ORCPT + 99 others); Tue, 29 Jan 2019 06:52:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:44250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732083AbfA2LwY (ORCPT ); Tue, 29 Jan 2019 06:52:24 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 BDC7F20882; Tue, 29 Jan 2019 11:52:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762744; bh=twUBzgsuVUqfsbqvgxU90t7Y/jPuf/e5InN9BaL9Fg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j8Mn1ShtkXq3B6/zENJgqqaMsnPiXjH1jtiCjjKCp5AgDS+u1/huatt6jg/uzWsiz 502ZEe2WY3KnkKhWULC+iDIYZzdirdC7Aky2MIS1Xlq/i9VvdYeaFDs97CY2Q9IhYy zPp+Z2Wn4VVJ9hi0c38WWSGh/GIaD0RpXT2Yt/yw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeff Mahoney , David Sterba , Sudip Mukherjee Subject: [PATCH 4.9 43/44] btrfs: fix error handling in btrfs_dev_replace_start Date: Tue, 29 Jan 2019 12:36:38 +0100 Message-Id: <20190129113143.456682357@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129113139.826927690@linuxfoundation.org> References: <20190129113139.826927690@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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Mahoney commit 5c06147128fbbdf7a84232c5f0d808f53153defe upstream. When we fail to start a transaction in btrfs_dev_replace_start, we leave dev_replace->replace_start set to STARTED but clear ->srcdev and ->tgtdev. Later, that can result in an Oops in btrfs_dev_replace_progress when having state set to STARTED or SUSPENDED implies that ->srcdev is valid. Also fix error handling when the state is already STARTED or SUSPENDED while starting. That, too, will clear ->srcdev and ->tgtdev even though it doesn't own them. This should be an impossible case to hit since we should be protected by the BTRFS_FS_EXCL_OP bit being set. Let's add an ASSERT there while we're at it. Fixes: e93c89c1aaaaa (Btrfs: add new sources for device replace code) CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Jeff Mahoney Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/dev-replace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -350,6 +350,7 @@ int btrfs_dev_replace_start(struct btrfs break; case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED: case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED: + ASSERT(0); ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED; goto leave; } @@ -394,6 +395,10 @@ int btrfs_dev_replace_start(struct btrfs if (IS_ERR(trans)) { ret = PTR_ERR(trans); btrfs_dev_replace_lock(dev_replace, 1); + dev_replace->replace_state = + BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED; + dev_replace->srcdev = NULL; + dev_replace->tgtdev = NULL; goto leave; } @@ -415,8 +420,6 @@ int btrfs_dev_replace_start(struct btrfs return ret; leave: - dev_replace->srcdev = NULL; - dev_replace->tgtdev = NULL; btrfs_dev_replace_unlock(dev_replace, 1); btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device); return ret;