Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fecbec3b authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

btrfs: return error pointer from alloc_test_extent_buffer 



[ Upstream commit b6293c821ea8fa2a631a2112cd86cd435effeb8b ]

Callers of alloc_test_extent_buffer have not correctly interpreted the
return value as error pointer, as alloc_test_extent_buffer should behave
as alloc_extent_buffer. The self-tests were unaffected but
btrfs_find_create_tree_block could call both functions and that would
cause problems up in the call chain.

Fixes: faa2dbf0 ("Btrfs: add sanity tests for new qgroup accounting code")
CC: stable@vger.kernel.org # 4.4+
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 863153c1

fs/btrfs/extent_io.c

+4 −2
Original line number Diff line number Diff line
@@ -4994,12 +4994,14 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, 
		return eb;

	eb = alloc_dummy_extent_buffer(fs_info, start, nodesize);

	if (!eb)

		return NULL;

		return ERR_PTR(-ENOMEM);

	eb->fs_info = fs_info;

again:

	ret = radix_tree_preload(GFP_NOFS);

	if (ret)

	if (ret) {

		exists = ERR_PTR(ret);

		goto free_eb;

	}

	spin_lock(&fs_info->buffer_lock);

	ret = radix_tree_insert(&fs_info->buffer_radix,

				start >> PAGE_SHIFT, eb);

fs/btrfs/tests/free-space-tree-tests.c

+3 −3
Original line number Diff line number Diff line
@@ -476,9 +476,9 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, 


	root->node = alloc_test_extent_buffer(root->fs_info,

		nodesize, nodesize);

	if (!root->node) {

		test_msg("Couldn't allocate dummy buffer\n");

		ret = -ENOMEM;

	if (IS_ERR(root->node)) {

		test_msg("couldn't allocate dummy buffer\n");

		ret = PTR_ERR(root->node);

		goto out;

	}

	btrfs_set_header_level(root->node, 0);

fs/btrfs/tests/qgroup-tests.c

+2 −2
Original line number Diff line number Diff line
@@ -488,9 +488,9 @@ int btrfs_test_qgroups(u32 sectorsize, u32 nodesize) 
	 */

	root->node = alloc_test_extent_buffer(root->fs_info, nodesize,

					nodesize);

	if (!root->node) {

	if (IS_ERR(root->node)) {

		test_msg("Couldn't allocate dummy buffer\n");

		ret = -ENOMEM;

		ret = PTR_ERR(root->node);

		goto out;

	}

	btrfs_set_header_level(root->node, 0);