btrfs: factor out validation of btrfs_ioctl_vol_args::name

The validation of vol args name in several ioctls is not done properly.
a terminating NUL is written to the end of the buffer unconditionally,
assuming that this would be the last place in case the buffer is used
completely. This does not communicate back the actual error (either an
invalid or too long path).

Factor out all such cases and use a helper to do the verification,
simply look for NUL in the buffer. There's no expected practical change,
the size of buffer is 4088, this is enough for most paths or names.

Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h
index a7c3f9abc53a51a40c9a7c57bb8183de8993d840..93f5c57ea4e3595a0715ec1b595d50016550a303 100644 (file)
--- a/fs/btrfs/fs.h
+++ b/fs/btrfs/fs.h
@@ -973,6 +973,8 @@ void btrfs_exclop_finish(struct btrfs_fs_info *fs_info);
 void btrfs_exclop_balance(struct btrfs_fs_info *fs_info,
                          enum btrfs_exclusive_operation op);
 
+int btrfs_check_ioctl_vol_args_path(const struct btrfs_ioctl_vol_args *vol_args);
+
 /* Compatibility and incompatibility defines */
 void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,
                             const char *name);

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index eb736281eb639fa12536d84b7b845a305e797a85..81d3117954037ac737fca02194de1d8d3d36949d 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -227,6 +227,13 @@ static int check_fsflags_compatible(struct btrfs_fs_info *fs_info,
        return 0;
 }
 
+int btrfs_check_ioctl_vol_args_path(const struct btrfs_ioctl_vol_args *vol_args)
+{
+       if (memchr(vol_args->name, 0, sizeof(vol_args->name)) == NULL)
+               return -ENAMETOOLONG;
+       return 0;
+}
+
 /*
  * Set flags/xflags from the internal inode flags. The remaining items of
  * fsxattr are zeroed.
@@ -1126,7 +1133,10 @@ static noinline int btrfs_ioctl_resize(struct file *file,
                ret = PTR_ERR(vol_args);
                goto out_drop;
        }
-       vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
+       ret = btrfs_check_ioctl_vol_args_path(vol_args);
+       if (ret < 0)
+               goto out_free;
+
        sizestr = vol_args->name;
        cancel = (strcmp("cancel", sizestr) == 0);
        ret = exclop_start_or_cancel_reloc(fs_info, BTRFS_EXCLOP_RESIZE, cancel);
@@ -1326,12 +1336,15 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
        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';
+       ret = btrfs_check_ioctl_vol_args_path(vol_args);
+       if (ret < 0)
+               goto out;
 
        ret = __btrfs_ioctl_snap_create(file, file_mnt_idmap(file),
                                        vol_args->name, vol_args->fd, subvol,
                                        false, NULL);
 
+out:
        kfree(vol_args);
        return ret;
 }
@@ -2464,7 +2477,10 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
                if (IS_ERR(vol_args))
                        return PTR_ERR(vol_args);
 
-               vol_args->name[BTRFS_PATH_NAME_MAX] = 0;
+               err = btrfs_check_ioctl_vol_args_path(vol_args);
+               if (err < 0)
+                       goto out;
+
                subvol_name = vol_args->name;
 
                err = mnt_want_write_file(file);
@@ -2675,12 +2691,16 @@ static long btrfs_ioctl_add_dev(struct btrfs_fs_info *fs_info, void __user *arg)
                goto out;
        }
 
-       vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
+       ret = btrfs_check_ioctl_vol_args_path(vol_args);
+       if (ret < 0)
+               goto out_free;
+
        ret = btrfs_init_new_device(fs_info, vol_args->name);
 
        if (!ret)
                btrfs_info(fs_info, "disk added %s", vol_args->name);
 
+out_free:
        kfree(vol_args);
 out:
        if (restore_op)
@@ -2772,7 +2792,10 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)
        if (IS_ERR(vol_args))
                return PTR_ERR(vol_args);
 
-       vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';
+       ret = btrfs_check_ioctl_vol_args_path(vol_args);
+       if (ret < 0)
+               goto out_free;
+
        if (!strcmp("cancel", vol_args->name)) {
                cancel = true;
        } else {
@@ -2799,6 +2822,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)
                bdev_release(bdev_handle);
 out:
        btrfs_put_dev_args_from_path(&args);
+out_free:
        kfree(vol_args);
        return ret;
 }

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 40ae264fd3ed500ded1f7f8263decd1f3b9da71e..7e44ccaf348f26083fd070fe4f8cc213ff12617a 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2201,7 +2201,9 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
        vol = memdup_user((void __user *)arg, sizeof(*vol));
        if (IS_ERR(vol))
                return PTR_ERR(vol);
-       vol->name[BTRFS_PATH_NAME_MAX] = '\0';
+       ret = btrfs_check_ioctl_vol_args_path(vol);
+       if (ret < 0)
+               goto out;
 
        switch (cmd) {
        case BTRFS_IOC_SCAN_DEV:
@@ -2243,6 +2245,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
                break;
        }
 
+out:
        kfree(vol);
        return ret;
 }