public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: hold a ref on the root in search_ioctl

Browse source 
We lookup a arbitrary fs root, we need to hold a ref on that root.  If
we're using our own inodes root then grab a ref on that as well to make
the cleanup easier.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2020-01-24 09:32:33 -05:00 • committed by David Sterba
parent fc92f79856
commit 3ca35e839e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/btrfs/ioctl.c
View file

@ -2180,7 +2180,7 @@ static noinline int search_ioctl(struct inode *inode,
if (sk->tree_id == 0) { if (sk->tree_id == 0) {
/* search the root of the inode that was passed */ /* search the root of the inode that was passed */
root = BTRFS_I(inode)->root; root = btrfs_grab_fs_root(BTRFS_I(inode)->root);
} else { } else {
key.objectid = sk->tree_id; key.objectid = sk->tree_id;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
@ -2190,6 +2190,10 @@ static noinline int search_ioctl(struct inode *inode,
btrfs_free_path(path); btrfs_free_path(path);
return PTR_ERR(root); return PTR_ERR(root);
} }
if (!btrfs_grab_fs_root(root)) {
btrfs_free_path(path);
return -ENOENT;
}
} }
key.objectid = sk->min_objectid; key.objectid = sk->min_objectid;
@ -2214,6 +2218,7 @@ static noinline int search_ioctl(struct inode *inode,
ret = 0; ret = 0;
err: err:
sk->nr_items = num_found; sk->nr_items = num_found;
btrfs_put_fs_root(root);
btrfs_free_path(path); btrfs_free_path(path);
return ret; return ret;
} }