From 31aa2b5fa7fad6b4bc382b9e40d5b44f856a3f53 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Wed, 28 May 2014 19:20:39 +0800 Subject: Btrfs-progs: fsck: disallow partial opening if critical roots corrupted If btrfs tree root is corrupted, fsck will hit the following segmentation. enabling repair mode Check tree block failed, want=29376512, have=0 Check tree block failed, want=29376512, have=0 Check tree block failed, want=29376512, have=0 Check tree block failed, want=29376512, have=0 Check tree block failed, want=29376512, have=0 read block failed check_tree_block Couldn't read tree root Checking filesystem on /dev/sda9 UUID: 0e1a754d-04a5-4256-ae79-0f769751803e Critical roots corrupted, unable to fsck the FS Segmentation fault (core dumped) In btrfs_setup_all_roots(), we could tolerate some trees(extent tree, csum tree) corrupted, and we have did careful check inside that function, it will return NULL if critial roots corrupt(for example tree root). The problem is that we check @OPEN_CTREE_PARTIAL flag again after calling btrfs_setup_all_roots() which will successfully return @fs_info though critial roots corrupted. Fix this problem by removing @OPEN_CTREE_PARTIAL flag check outsize btrfs_setup_all_roots(). Signed-off-by: Wang Shilong Signed-off-by: David Sterba --- disk-io.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'disk-io.c') diff --git a/disk-io.c b/disk-io.c index 4246aa6..ed0b462 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1130,13 +1130,10 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, ret = btrfs_setup_all_roots(fs_info, root_tree_bytenr, flags); if (ret) - goto out_failed; + goto out_chunk; return fs_info; -out_failed: - if (flags & OPEN_CTREE_PARTIAL) - return fs_info; out_chunk: btrfs_release_all_roots(fs_info); btrfs_cleanup_all_caches(fs_info); -- cgit v1.2.1