btrfs-progs: Check for open failure in btrfs_scan_lblkid()
authorEric Sandeen <sandeen@redhat.com>
Wed, 6 Nov 2013 23:15:49 +0000 (17:15 -0600)
committerChris Mason <chris.mason@fusionio.com>
Thu, 7 Nov 2013 21:10:41 +0000 (16:10 -0500)
open can fail, of course.

Resolves-Coverity-CID: 1125925
Resolves-Coverity-CID: 1125930
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
utils.c

diff --git a/utils.c b/utils.c
index 9f476ef..3c74f69 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -1978,12 +1978,16 @@ int btrfs_scan_lblkid(int update_kernel)
                dev = blkid_verify(cache, dev);
                if (!dev)
                        continue;
-               /* if we are here its definitly a btrfs disk*/
+               /* if we are here its definitely a btrfs disk*/
                strncpy(path, blkid_dev_devname(dev), PATH_MAX);
                if (test_skip_this_disk(path))
                        continue;
 
                fd = open(path, O_RDONLY);
+               if (fd < 0) {
+                       printf("ERROR: could not open %s\n", path);
+                       continue;
+               }
                btrfs_scan_one_device(fd, path, &tmp_devices,
                                &num_devices, BTRFS_SUPER_INFO_OFFSET);
                close(fd);