Btrfs-progs: seg fault in get_label_unmounted
authorAnand Jain <anand.jain@oracle.com>
Wed, 15 Aug 2012 08:29:53 +0000 (16:29 +0800)
committerroot <root@localhost.localdomain>
Thu, 4 Oct 2012 20:26:32 +0000 (16:26 -0400)
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 <anand.jain@oracle.com>
btrfslabel.c

index bf73802..cb142b0 100644 (file)
@@ -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;
 }