From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D0391586F5; Tue, 23 Jul 2024 18:42:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721760137; cv=none; b=dv4/6NbcnAiL4lO5+m1/klivQipuNHHYThvKO5T36OyMElWRsODitwidLjZd5v9IIddlAgrkP1UMd/SeXf0KjfTFOUyWdLJSNgBoeSbLTYvtjUYgP2azkpryDDF41s7DcUASIqXegC+aiK1lk6XithteoRiuDkB3LDg0fug7Xx4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721760137; c=relaxed/simple; bh=S4SnK1GBcU2G9p62OJt2mU88KwdvoYKypBu4H45SrW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gIIY+0dPCPSq1Gq9BnZkf3431zJkOwVmlxTiuBHXYOqAUziO8gOh9YJ08YBOxRyPllk9mQWTtzQ0PBBkw3TJYkiQJZocLHWFL0ix2pqaw7d1M7zPGsItta+Lozg+BRs7fV7IQyx5z8qeeV+CIeBNUTz3cUTOOE5am3GXEvpVSZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PKS4c4ia; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PKS4c4ia" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86318C4AF0A; Tue, 23 Jul 2024 18:42:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721760136; bh=S4SnK1GBcU2G9p62OJt2mU88KwdvoYKypBu4H45SrW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PKS4c4iapxTUcTEsyqzM4BDOCbIbtKZoBQNRh1Za4VMdHZjJrsnbbbtDWpcIJ0zlU QgJLB6Sp23mhXzVQxn/HJHK1QlHDi/xRzBLrAZmQLpCoxtKWHGW1SG6WEgPbsh1bAF PTrYYcoAgbN9YJgLndKsczAz9Kc8RBdGg0NMnXYE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Boris Burkov , Qu Wenruo , Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.9 115/163] btrfs: qgroup: fix quota root leak after quota disable failure Date: Tue, 23 Jul 2024 20:24:04 +0200 Message-ID: <20240723180147.917603293@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180143.461739294@linuxfoundation.org> References: <20240723180143.461739294@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Filipe Manana [ Upstream commit a7e4c6a3031c74078dba7fa36239d0f4fe476c53 ] If during the quota disable we fail when cleaning the quota tree or when deleting the root from the root tree, we jump to the 'out' label without ever dropping the reference on the quota root, resulting in a leak of the root since fs_info->quota_root is no longer pointing to the root (we have set it to NULL just before those steps). Fix this by always doing a btrfs_put_root() call under the 'out' label. This is a problem that exists since qgroups were first added in 2012 by commit bed92eae26cc ("Btrfs: qgroup implementation and prototypes"), but back then we missed a kfree on the quota root and free_extent_buffer() calls on its root and commit root nodes, since back then roots were not yet reference counted. Reviewed-by: Boris Burkov Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/qgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 4caa078d972a3..9af2afb417308 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1351,7 +1351,7 @@ static int flush_reservations(struct btrfs_fs_info *fs_info) int btrfs_quota_disable(struct btrfs_fs_info *fs_info) { - struct btrfs_root *quota_root; + struct btrfs_root *quota_root = NULL; struct btrfs_trans_handle *trans = NULL; int ret = 0; @@ -1449,9 +1449,9 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info) btrfs_free_tree_block(trans, btrfs_root_id(quota_root), quota_root->node, 0, 1); - btrfs_put_root(quota_root); out: + btrfs_put_root(quota_root); mutex_unlock(&fs_info->qgroup_ioctl_lock); if (ret && trans) btrfs_end_transaction(trans); -- 2.43.0