From e11712a146c8a16c697a60ead980a9da68eaaddf Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 6 Nov 2013 17:15:52 -0600 Subject: [PATCH] btrfs-progs: check btrfs_scan_one_device in btrfs_scan_lblkid() Even if it's "definitely" btrfs at this point, btrfs_scan_one_device could fail for other reasons. Check the return value, warn if it fails, and skip the device register. Resolves-Coverity-CID: 1125925 Signed-off-by: Eric Sandeen reviewed-by: Anand Jain Signed-off-by: Chris Mason --- utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils.c b/utils.c index 3c74f690..704b371e 100644 --- a/utils.c +++ b/utils.c @@ -1960,6 +1960,7 @@ int test_skip_this_disk(char *path) int btrfs_scan_lblkid(int update_kernel) { int fd = -1; + int ret; u64 num_devices; struct btrfs_fs_devices *tmp_devices; blkid_dev_iterate iter = NULL; @@ -1988,8 +1989,14 @@ int btrfs_scan_lblkid(int update_kernel) printf("ERROR: could not open %s\n", path); continue; } - btrfs_scan_one_device(fd, path, &tmp_devices, + ret = btrfs_scan_one_device(fd, path, &tmp_devices, &num_devices, BTRFS_SUPER_INFO_OFFSET); + if (ret) { + printf("ERROR: could not scan %s\n", path); + close (fd); + continue; + } + close(fd); if (update_kernel) btrfs_register_one_device(path);