aboutsummaryrefslogtreecommitdiffstats
path: root/disk-io.c
diff options
context:
space:
mode:
authorEryu Guan <guaneryu@gmail.com>2014-01-10 22:50:02 +0800
committerChris Mason <clm@fb.com>2014-01-31 08:22:25 -0800
commitb2e99e1819d967828edf149db5a203e59a40e379 (patch)
treece30a1c71f736e438a9eaa8ec2cf133cd0850080 /disk-io.c
parent257a71cb24b04d5a7477b0618665ceb1e1cc149b (diff)
downloadbtrfs-progs-b2e99e1819d967828edf149db5a203e59a40e379.tar.gz
btrfs-progs-b2e99e1819d967828edf149db5a203e59a40e379.tar.xz
btrfs-progs-b2e99e1819d967828edf149db5a203e59a40e379.zip
Btrfs-progs: check return value of read_tree_block() in check_chunks_and_extents()
The following steps could trigger btrfs segfault: mkfs -t btrfs -m raid5 -d raid5 /dev/loop{0..3} losetup -d /dev/loop2 btrfs check /dev/loop0 The reason is that read_tree_block() returns NULL and add_root_to_pending() dereferences it without checking it first. Also replace a BUG_ON with proper error checking. Signed-off-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'disk-io.c')
-rw-r--r--disk-io.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/disk-io.c b/disk-io.c
index 7eda2e1..8009b94 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -644,7 +644,10 @@ out:
blocksize = btrfs_level_size(root, btrfs_root_level(&root->root_item));
root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item),
blocksize, generation);
- BUG_ON(!root->node);
+ if (!root->node) {
+ free(root);
+ return ERR_PTR(-EIO);
+ }
insert:
root->ref_cows = 1;
return root;