RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-03 03:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: add sanity checks for btrfs device operations

Browse Source 
Make sure we are a block device firstly, this can avoid some
unnecessary ioctls operations.

Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Wang Shilong 2013-12-12 15:47:00 +08:00 committed by Chris Mason
parent fd777c3695
commit e3c9596d3f
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmds-device.c
View File

@ -161,6 +161,12 @@ static int cmd_rm_dev(int argc, char **argv)
struct btrfs_ioctl_vol_args arg; struct btrfs_ioctl_vol_args arg;
int res; int res;
if (!is_block_device(argv[i])) {
fprintf(stderr,
"ERROR: %s is not a block device\n", argv[i]);
ret++;
continue;
}
strncpy_null(arg.name, argv[i]); strncpy_null(arg.name, argv[i]);
res = ioctl(fdmnt, BTRFS_IOC_RM_DEV, &arg); res = ioctl(fdmnt, BTRFS_IOC_RM_DEV, &arg);
e = errno; e = errno;
@ -222,6 +228,12 @@ static int cmd_scan_dev(int argc, char **argv)
struct btrfs_ioctl_vol_args args; struct btrfs_ioctl_vol_args args;
int ret; int ret;
if (!is_block_device(argv[i])) {
fprintf(stderr,
"ERROR: %s is not a block device\n", argv[i]);
close(fd);
return 1;
}
printf("Scanning for Btrfs filesystems in '%s'\n", argv[i]); printf("Scanning for Btrfs filesystems in '%s'\n", argv[i]);
strncpy_null(args.name, argv[i]); strncpy_null(args.name, argv[i]);
@ -265,6 +277,12 @@ static int cmd_ready_dev(int argc, char **argv)
perror("failed to open /dev/btrfs-control"); perror("failed to open /dev/btrfs-control");
return 1; return 1;
} }
if (!is_block_device(argv[1])) {
fprintf(stderr,
"ERROR: %s is not a block device\n", argv[1]);
close(fd);
return 1;
}
strncpy(args.name, argv[argc - 1], BTRFS_PATH_NAME_MAX); strncpy(args.name, argv[argc - 1], BTRFS_PATH_NAME_MAX);
ret = ioctl(fd, BTRFS_IOC_DEVICES_READY, &args); ret = ioctl(fd, BTRFS_IOC_DEVICES_READY, &args);