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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 DAD3EC5ED2B for ; Thu, 27 Feb 2020 14:19:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6F4820801 for ; Thu, 27 Feb 2020 14:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813195; bh=wrQyzlkTVJsIuG6RhczZKrYJFH7Mb49YCuVssq9BS0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hRFkJqBlWG8ciW9AJ7KdGvJqmWuwj7zurKvZXSemudqf9C/tMYzE/ooYwDzFyzATW NIq+CQ31UDkE1L4YmFdwpen3fkjofrwQ3GMVsmPbcCxsmmoFHWbrpyEaUZStz/ypD7 ZaA9vBaVD/WH/v5xFXGKGaSeHSWXAnlSmUOJCSV8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389685AbgB0OTy (ORCPT ); Thu, 27 Feb 2020 09:19:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:59226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389902AbgB0OSg (ORCPT ); Thu, 27 Feb 2020 09:18:36 -0500 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 6A32624690; Thu, 27 Feb 2020 14:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813115; bh=wrQyzlkTVJsIuG6RhczZKrYJFH7Mb49YCuVssq9BS0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fe707PaRnl3v++ukWOq3Sgesdhh2JG72cTpk6IjFglXBeHspG1SANx8mz3fmTzigQ HRwQ65snBPc0wLOUQ0zZfm+/RVykIXbEhptg9HhfFSUyYlt1HBxshgR1Fn6DSfVTXh E9K5e4n4HEhrzzdn2WMxptnTDNYkc7ZpnZrDJJZc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Johannes Thumshirn , Qu Wenruo , Josef Bacik , David Sterba Subject: [PATCH 5.5 106/150] btrfs: reset fs_root to NULL on error in open_ctree Date: Thu, 27 Feb 2020 14:37:23 +0100 Message-Id: <20200227132248.442137596@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132232.815448360@linuxfoundation.org> References: <20200227132232.815448360@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: Josef Bacik commit 315bf8ef914f31d51d084af950703aa1e09a728c upstream. While running my error injection script I hit a panic when we tried to clean up the fs_root when freeing the fs_root. This is because fs_info->fs_root == PTR_ERR(-EIO), which isn't great. Fix this by setting fs_info->fs_root = NULL; if we fail to read the root. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Nikolay Borisov Reviewed-by: Johannes Thumshirn Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/disk-io.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3200,6 +3200,7 @@ int __cold open_ctree(struct super_block if (IS_ERR(fs_info->fs_root)) { err = PTR_ERR(fs_info->fs_root); btrfs_warn(fs_info, "failed to read fs tree: %d", err); + fs_info->fs_root = NULL; goto fail_qgroup; }