]> git.hungrycats.org Git - linux/commitdiff
btrfs: hold a ref on the root in search_ioctl
authorJosef Bacik <josef@toxicpanda.com>
Wed, 20 Nov 2019 18:41:45 +0000 (10:41 -0800)
committerJosef Bacik <josef@toxicpanda.com>
Fri, 6 Dec 2019 16:34:48 +0000 (08:34 -0800)
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>
fs/btrfs/ioctl.c

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