[PATCH] btrfs-progs: Kill ASSERT() for damaged filesystem

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



For damaged filesystem like 'bko-155621-bad-block-group-offset.raw' from
fuzzed tests, there may be no valid METADATA blocks at all.

Thus we could hit the following ASSERT():
  extent-tree.c:2484: alloc_tree_block: Assertion `sinfo` failed, value 0
  btrfs(+0x20ef8)[0x555adf5b2ef8]
  btrfs(+0x2107b)[0x555adf5b307b]
  btrfs(+0x27e7e)[0x555adf5b9e7e]
  btrfs(btrfs_alloc_free_block+0x67)[0x555adf5ba097]
  btrfs(+0x61188)[0x555adf5f3188]
  btrfs(+0x70921)[0x555adf602921]
  btrfs(main+0x94)[0x555adf5a7168]
  /usr/lib/libc.so.6(__libc_start_main+0xf3)[0x7fbd4c658ee3]
  btrfs(_start+0x2e)[0x555adf5a6cee]

The ASSERT() expects that every filesystem has one METADATA block
groups, but btrfs-check can accept any damaged filesystem.

So kill the ASSERT(), and return -EUCLEAN with one error message.

Signed-off-by: Qu Wenruo <wqu@xxxxxxxx>
---
To David:
Please fold this tiny modification to the following patch:
a970af98a1eb ("btrfs-progs: Fix false ENOSPC alert by tracking used space
correctly").

Sorry for the inconvience.
---
 extent-tree.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extent-tree.c b/extent-tree.c
index 1ebdf71f..932af2c6 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -2481,7 +2481,10 @@ static int alloc_tree_block(struct btrfs_trans_handle *trans,
 		return -ENOMEM;
 
 	sinfo = __find_space_info(fs_info, BTRFS_BLOCK_GROUP_METADATA);
-	ASSERT(sinfo);
+	if (!sinfo) {
+		error("Corrupted fs, no valid METADATA block group found");
+		return -EUCLEAN;
+	}
 	ret = btrfs_reserve_extent(trans, root, num_bytes, empty_size,
 				   hint_byte, search_end, ins, 0);
 	if (ret < 0)
-- 
2.22.0




[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux