Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp3540422pxb; Tue, 19 Apr 2022 05:05:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyspJiU89ZF/Uv3+bAPvcIK0NfP1a8hHikLTz4iqHhh4ZCAhIZwZGHDz15DO5FF43q8bCFP X-Received: by 2002:a63:e146:0:b0:39d:1b00:e475 with SMTP id h6-20020a63e146000000b0039d1b00e475mr14299343pgk.537.1650369907153; Tue, 19 Apr 2022 05:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650369907; cv=none; d=google.com; s=arc-20160816; b=sZSnzTjzKz8N57F/b+xwzBzXDxTxoPR2B5Qj5L9I136c5iiplgUft0Cyp3OyF6gkRl pp13VtbfopKRJ/EizfXBfVW0212PLZAbB7U+o/1qhx0B49hUgbaDRT/0qgs4gtbnItge DN578qbfDpSkSEFj9jFGrhePnWmLcHWwDfUekKrJp1uM38qWFU9ed3R/gJXo8XlEIb0Q cnp7HY3vznW7skb5dn4W0kP10cRcO81/js/rxk07f0GlthLIXA3gxN+A04fmUlwIDTcy 7AxtUiOOLHODzXJxXJVO5YAQySWwMbzfhMXmV7sHJO5mgI3ltmSYHXrkO24Ng5Xh6/hQ 5eWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZTmzQLfWFxprVOy5mDzwS0P8rmmduQyy3b1tz4ziloM=; b=WWlG22slytI6Gl88tTZxuWIoAKCxkCoFKiYFar7Sa9qDBtw+8LRCDipVfS6PixMIMh qrEztakpPScwXAeXOHlLQeIBo/9kfq9BLD3/X+jHeYXQ3ZrcYtq0cIN6KkpYnmRUhVlF RhU30a5MPiZYyRKFKp7jJCI6BoXYkCrex4n2oxyIpPXr64+XLUujUa6hJaaio//OsiG8 u05P1u1fr7a7C1lehVCE1rkJjzLCOG3m5ZUvRf8lIonI4ghx5Fq9HmiKUoymkdHI2zmp 9PfZrf0RgQ3dakv6/IdxsONvINRa+oYfuoCGDOcvwcW9aPlzcalG4SEBVNiXeX1PGRI0 aT1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eZ5U2iCo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q11-20020a056a00150b00b005058be0ff8fsi13167893pfu.210.2022.04.19.05.04.50; Tue, 19 Apr 2022 05:05:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eZ5U2iCo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241966AbiDRNNO (ORCPT + 99 others); Mon, 18 Apr 2022 09:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242285AbiDRM7q (ORCPT ); Mon, 18 Apr 2022 08:59:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6D332FFDB; Mon, 18 Apr 2022 05:40:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CA3EDB80EDB; Mon, 18 Apr 2022 12:40:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 293ACC385A7; Mon, 18 Apr 2022 12:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650285632; bh=HUvu37Z9AailgtyzSCymtdSt1iU2nxgmgL3q7izu10o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eZ5U2iCovrZGRNJolAmRHpVr5uTlIZTKiOdw2kHgontJTRdWPav+YTDkv8p3pvccU ipfSxc1bQAak/jr7VdIDpIsA/IC3SjciMtFuvqjFq7HvSBuYd6Q863JECGlYX74X+V 0VmXwPU9DTTZXpyUn8ru5WYv9gnK4mPXG7g2Bhc0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, TOTE Robot , Jia-Ju Bai , David Sterba Subject: [PATCH 5.10 079/105] btrfs: fix root ref counts in error handling in btrfs_get_root_ref Date: Mon, 18 Apr 2022 14:13:21 +0200 Message-Id: <20220418121148.875685525@linuxfoundation.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220418121145.140991388@linuxfoundation.org> References: <20220418121145.140991388@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jia-Ju Bai commit 168a2f776b9762f4021421008512dd7ab7474df1 upstream. In btrfs_get_root_ref(), when btrfs_insert_fs_root() fails, btrfs_put_root() can happen for two reasons: - the root already exists in the tree, in that case it returns the reference obtained in btrfs_lookup_fs_root() - another error so the cleanup is done in the fail label Calling btrfs_put_root() unconditionally would lead to double decrement of the root reference possibly freeing it in the second case. Reported-by: TOTE Robot Fixes: bc44d7c4b2b1 ("btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root") CC: stable@vger.kernel.org # 5.10+ Signed-off-by: Jia-Ju Bai Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/disk-io.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1596,9 +1596,10 @@ again: ret = btrfs_insert_fs_root(fs_info, root); if (ret) { - btrfs_put_root(root); - if (ret == -EEXIST) + if (ret == -EEXIST) { + btrfs_put_root(root); goto again; + } goto fail; } return root;