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

Commit 4b3576e4 authored Aug 05, 2015 by Zhaolei Committed by Chris Mason Aug 09, 2015

btrfs: Error handle for get_ref_objectid_v0() in relocate_block_group()



We need error checking code for get_ref_objectid_v0() in
relocate_block_group(), to avoid unpredictable result, especially
for accessing uninitialized value(when function failed) after
this line.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>

parent 55e3a601

fs/btrfs/relocation.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3976,6 +3976,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
	sizeof(struct btrfs_extent_item_v0));		sizeof(struct btrfs_extent_item_v0));
	ret = get_ref_objectid_v0(rc, path, &key, &ref_owner,		ret = get_ref_objectid_v0(rc, path, &key, &ref_owner,
	&path_change);		&path_change);
			if (ret < 0) {
			err = ret;
			break;
			}
	if (ref_owner < BTRFS_FIRST_FREE_OBJECTID)		if (ref_owner < BTRFS_FIRST_FREE_OBJECTID)
	flags = BTRFS_EXTENT_FLAG_TREE_BLOCK;		flags = BTRFS_EXTENT_FLAG_TREE_BLOCK;
	else		else