From f4dfc8f6edb62c0a73b6334fc04ac399a289c449 Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Wed, 15 Aug 2012 16:29:53 +0800 Subject: Btrfs-progs: seg fault in get_label_unmounted btrfs f l / No valid Btrfs found on / Segmentation fault (core dumped) open_ctree can return NULL, we need to check that. Signed-off-by: Anand Jain --- btrfslabel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'btrfslabel.c') diff --git a/btrfslabel.c b/btrfslabel.c index bf738024..cb142b0a 100644 --- a/btrfslabel.c +++ b/btrfslabel.c @@ -67,7 +67,7 @@ static void change_label_unmounted(char *dev, char *nLabel) close_ctree(root); } -static void get_label_unmounted(char *dev) +int get_label_unmounted(char *dev) { struct btrfs_root *root; @@ -76,10 +76,14 @@ static void get_label_unmounted(char *dev) */ root = open_ctree(dev, 0, 0); + if(!root) + return -1; + fprintf(stdout, "%s\n", root->fs_info->super_copy.label); /* Now we close it since we are done. */ close_ctree(root); + return 0; } int get_label(char *btrfs_dev) @@ -98,8 +102,8 @@ int get_label(char *btrfs_dev) fprintf(stderr, "FATAL: the filesystem has to be unmounted\n"); return -2; } - get_label_unmounted(btrfs_dev); - return 0; + ret = get_label_unmounted(btrfs_dev); + return ret; } -- cgit v1.2.3