]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
authorDavid Sterba <dsterba@suse.com>
Tue, 23 Jan 2024 22:42:29 +0000 (23:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 11:01:44 +0000 (13:01 +0200)
[ 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>
fs/btrfs/volumes.c

index 1ce0fa487e5b281ba84e27a79b7c1e2fe35c9c39..36e77956c63fa8ffc491335e2ffdec3ac930852e 100644 (file)
@@ -3358,7 +3358,17 @@ again:
                        mutex_unlock(&fs_info->reclaim_bgs_lock);
                        goto error;
                }
-               BUG_ON(ret == 0); /* Corruption */
+               if (ret == 0) {
+                       /*
+                        * On the first search we would find chunk tree with
+                        * offset -1, which is not possible. On subsequent
+                        * loops this would find an existing item on an invalid
+                        * offset (one less than the previous one, wrong
+                        * alignment and size).
+                        */
+                       ret = -EUCLEAN;
+                       goto error;
+               }
 
                ret = btrfs_previous_item(chunk_root, path, key.objectid,
                                          key.type);