Skip to content

Commit

Permalink
btrfs: make root id query unprivileged
Browse files Browse the repository at this point in the history
The INO_LOOKUP ioctl can lookup path for a given inode number and is
thus restricted. As a sideefect it can find the root id of the
containing subvolume and we're using this int the 'btrfs inspect rootid'
command.

The restriction is unnecessary in case we set the ioctl args
 args::treeid    = 0
 args::objectid  = 256 (BTRFS_FIRST_FREE_OBJECTID)

Then the path will be empty and the treeid is filled with the root id of
the inode on which the ioctl is called. This behaviour is unchanged,
after the root restriction is removed.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
  • Loading branch information
David Sterba authored and Chris Mason committed Jun 3, 2015
1 parent 2e6e518 commit 01b810b
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2271,24 +2271,36 @@ static noinline int btrfs_ioctl_ino_lookup(struct file *file,
{
struct btrfs_ioctl_ino_lookup_args *args;
struct inode *inode;
int ret;

if (!capable(CAP_SYS_ADMIN))
return -EPERM;
int ret = 0;

args = memdup_user(argp, sizeof(*args));
if (IS_ERR(args))
return PTR_ERR(args);

inode = file_inode(file);

/*
* Unprivileged query to obtain the containing subvolume root id. The
* path is reset so it's consistent with btrfs_search_path_in_tree.
*/
if (args->treeid == 0)
args->treeid = BTRFS_I(inode)->root->root_key.objectid;

if (args->objectid == BTRFS_FIRST_FREE_OBJECTID) {
args->name[0] = 0;
goto out;
}

if (!capable(CAP_SYS_ADMIN)) {
ret = -EPERM;
goto out;
}

ret = btrfs_search_path_in_tree(BTRFS_I(inode)->root->fs_info,
args->treeid, args->objectid,
args->name);

out:
if (ret == 0 && copy_to_user(argp, args, sizeof(*args)))
ret = -EFAULT;

Expand Down

0 comments on commit 01b810b

Please sign in to comment.