summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorStefan Behrens <sbehrens@giantdisaster.de>2012-03-19 16:17:22 +0100
committerDavid Sterba <dsterba@suse.cz>2012-04-18 19:22:35 +0200
commit99ba55ad696944b37d5557bc5b4816890854fdb9 (patch)
tree2c8bf9a167f351b89ef86e2133ffec7dfb5d1ce7 /fs
parentb9688bb8459b67e42327de6420edb405a9188775 (diff)
downloadlinux-3.10-99ba55ad696944b37d5557bc5b4816890854fdb9.tar.gz
linux-3.10-99ba55ad696944b37d5557bc5b4816890854fdb9.tar.bz2
linux-3.10-99ba55ad696944b37d5557bc5b4816890854fdb9.zip
Btrfs: fix btrfs_ioctl_dev_info() crash on missing device
When a filesystem is mounted with the degraded option, it is possible that some of the devices are not there. btrfs_ioctl_dev_info() crashs in this case because the device name is a NULL pointer. This ioctl was only used for scrub. Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ioctl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 18cc23d164a..14f8e1faa46 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2262,7 +2262,10 @@ static long btrfs_ioctl_dev_info(struct btrfs_root *root, void __user *arg)
di_args->bytes_used = dev->bytes_used;
di_args->total_bytes = dev->total_bytes;
memcpy(di_args->uuid, dev->uuid, sizeof(di_args->uuid));
- strncpy(di_args->path, dev->name, sizeof(di_args->path));
+ if (dev->name)
+ strncpy(di_args->path, dev->name, sizeof(di_args->path));
+ else
+ di_args->path[0] = '\0';
out:
if (ret == 0 && copy_to_user(arg, di_args, sizeof(*di_args)))