From 670b953e28c25f835b713a22b03b9b0f86d8e025 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 1 Nov 2011 23:47:22 +0200 Subject: [PATCH 137/138] Btrfs-progs: fail gracefully on error from open_ctree() Error checking block got moved mistakenly exposing us to a potential segmentation fault. Signed-off-by: Ilya Dryomov --- mkfs.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mkfs.c b/mkfs.c index d39c5a7..d4d13af 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1359,7 +1359,12 @@ int main(int ac, char **av) fprintf(stderr, "error during mkfs %d\n", ret); exit(1); } + root = open_ctree(file, 0, O_RDWR); + if (!root) { + fprintf(stderr, "ctree init failed\n"); + return -1; + } root->fs_info->alloc_start = alloc_start; ret = make_root_dir(root, mixed); @@ -1374,10 +1379,6 @@ int main(int ac, char **av) goto raid_groups; btrfs_register_one_device(file); - if (!root) { - fprintf(stderr, "ctree init failed\n"); - return -1; - } zero_end = 1; while(ac-- > 0) { -- 1.7.6.233.gd79bc