|
@@ -461,15 +461,9 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
return -EPERM;
|
|
|
|
|
|
- vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
|
|
-
|
|
|
|
- if (!vol_args)
|
|
|
|
- return -ENOMEM;
|
|
|
|
-
|
|
|
|
- if (copy_from_user(vol_args, arg, sizeof(*vol_args))) {
|
|
|
|
- ret = -EFAULT;
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
|
|
+ vol_args = memdup_user(arg, sizeof(*vol_args));
|
|
|
|
+ if (IS_ERR(vol_args))
|
|
|
|
+ return PTR_ERR(vol_args);
|
|
|
|
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
namelen = strlen(vol_args->name);
|
|
namelen = strlen(vol_args->name);
|
|
@@ -545,7 +539,6 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
|
|
|
|
|
|
out_unlock:
|
|
out_unlock:
|
|
mutex_unlock(&root->fs_info->volume_mutex);
|
|
mutex_unlock(&root->fs_info->volume_mutex);
|
|
-out:
|
|
|
|
kfree(vol_args);
|
|
kfree(vol_args);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -565,15 +558,9 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
return -EROFS;
|
|
return -EROFS;
|
|
|
|
|
|
- vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
|
|
-
|
|
|
|
- if (!vol_args)
|
|
|
|
- return -ENOMEM;
|
|
|
|
-
|
|
|
|
- if (copy_from_user(vol_args, arg, sizeof(*vol_args))) {
|
|
|
|
- ret = -EFAULT;
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
|
|
+ vol_args = memdup_user(arg, sizeof(*vol_args));
|
|
|
|
+ if (IS_ERR(vol_args))
|
|
|
|
+ return PTR_ERR(vol_args);
|
|
|
|
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
namelen = strlen(vol_args->name);
|
|
namelen = strlen(vol_args->name);
|
|
@@ -675,19 +662,13 @@ static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg)
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
return -EPERM;
|
|
|
|
|
|
- vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
|
|
|
|
+ vol_args = memdup_user(arg, sizeof(*vol_args));
|
|
|
|
+ if (IS_ERR(vol_args))
|
|
|
|
+ return PTR_ERR(vol_args);
|
|
|
|
|
|
- if (!vol_args)
|
|
|
|
- return -ENOMEM;
|
|
|
|
-
|
|
|
|
- if (copy_from_user(vol_args, arg, sizeof(*vol_args))) {
|
|
|
|
- ret = -EFAULT;
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
ret = btrfs_init_new_device(root, vol_args->name);
|
|
ret = btrfs_init_new_device(root, vol_args->name);
|
|
|
|
|
|
-out:
|
|
|
|
kfree(vol_args);
|
|
kfree(vol_args);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -703,19 +684,13 @@ static long btrfs_ioctl_rm_dev(struct btrfs_root *root, void __user *arg)
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
if (root->fs_info->sb->s_flags & MS_RDONLY)
|
|
return -EROFS;
|
|
return -EROFS;
|
|
|
|
|
|
- vol_args = kmalloc(sizeof(*vol_args), GFP_NOFS);
|
|
|
|
|
|
+ vol_args = memdup_user(arg, sizeof(*vol_args));
|
|
|
|
+ if (IS_ERR(vol_args))
|
|
|
|
+ return PTR_ERR(vol_args);
|
|
|
|
|
|
- if (!vol_args)
|
|
|
|
- return -ENOMEM;
|
|
|
|
-
|
|
|
|
- if (copy_from_user(vol_args, arg, sizeof(*vol_args))) {
|
|
|
|
- ret = -EFAULT;
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
|
|
ret = btrfs_rm_device(root, vol_args->name);
|
|
ret = btrfs_rm_device(root, vol_args->name);
|
|
|
|
|
|
-out:
|
|
|
|
kfree(vol_args);
|
|
kfree(vol_args);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|