Skip to content

Commit

Permalink
btrfs: ensure that file descriptor used with subvol ioctls is a dir
Browse files Browse the repository at this point in the history
commit 325c50e upstream.

If the subvol/snapshot create/destroy ioctls are passed a regular file
with execute permissions set, we'll eventually Oops while trying to do
inode->i_op->lookup via lookup_one_len.

This patch ensures that the file descriptor refers to a directory.

Fixes: cb8e709 (Btrfs: Fix subvolume creation locking rules)
Fixes: 76dda93 (Btrfs: add snapshot/subvolume destroy ioctl)
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
jeffmahoney authored and bwhacks committed Nov 20, 2016
1 parent 77d74c0 commit d1adfc5
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions fs/btrfs/ioctl.c
Expand Up @@ -1649,6 +1649,9 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file,
int namelen;
int ret = 0;

if (!S_ISDIR(file_inode(file)->i_mode))
return -ENOTDIR;

ret = mnt_want_write_file(file);
if (ret)
goto out;
Expand Down Expand Up @@ -1706,6 +1709,9 @@ static noinline int btrfs_ioctl_snap_create(struct file *file,
struct btrfs_ioctl_vol_args *vol_args;
int ret;

if (!S_ISDIR(file_inode(file)->i_mode))
return -ENOTDIR;

vol_args = memdup_user(arg, sizeof(*vol_args));
if (IS_ERR(vol_args))
return PTR_ERR(vol_args);
Expand All @@ -1729,6 +1735,9 @@ static noinline int btrfs_ioctl_snap_create_v2(struct file *file,
bool readonly = false;
struct btrfs_qgroup_inherit *inherit = NULL;

if (!S_ISDIR(file_inode(file)->i_mode))
return -ENOTDIR;

vol_args = memdup_user(arg, sizeof(*vol_args));
if (IS_ERR(vol_args))
return PTR_ERR(vol_args);
Expand Down Expand Up @@ -2355,6 +2364,9 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
int ret;
int err = 0;

if (!S_ISDIR(dir->i_mode))
return -ENOTDIR;

vol_args = memdup_user(arg, sizeof(*vol_args));
if (IS_ERR(vol_args))
return PTR_ERR(vol_args);
Expand Down

0 comments on commit d1adfc5

Please sign in to comment.