Skip to content

Commit 8223db2

Browse files
kdavesmb49
authored andcommitted
btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
BugLink: https://bugs.launchpad.net/bugs/2065899 [ Upstream commit 7411055db5ce64f836aaffd422396af0075fdc99 ] The unhandled case in btrfs_relocate_sys_chunks() loop is a corruption, as it could be caused only by two impossible conditions: - at first the search key is set up to look for a chunk tree item, with offset -1, this is an inexact search and the key->offset will contain the correct offset upon a successful search, a valid chunk tree item cannot have an offset -1 - after first successful search, the found_key corresponds to a chunk item, the offset is decremented by 1 before the next loop, it's impossible to find a chunk item there due to alignment and size constraints Reviewed-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 4835a5e commit 8223db2

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

fs/btrfs/volumes.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3440,7 +3440,17 @@ static int btrfs_relocate_sys_chunks(struct btrfs_fs_info *fs_info)
34403440
mutex_unlock(&fs_info->reclaim_bgs_lock);
34413441
goto error;
34423442
}
3443-
BUG_ON(ret == 0); /* Corruption */
3443+
if (ret == 0) {
3444+
/*
3445+
* On the first search we would find chunk tree with
3446+
* offset -1, which is not possible. On subsequent
3447+
* loops this would find an existing item on an invalid
3448+
* offset (one less than the previous one, wrong
3449+
* alignment and size).
3450+
*/
3451+
ret = -EUCLEAN;
3452+
goto error;
3453+
}
34443454

34453455
ret = btrfs_previous_item(chunk_root, path, key.objectid,
34463456
key.type);

0 commit comments

Comments
 (0)