Skip to content

Commit

Permalink
btrfs: Handle uninitialised inode eviction
Browse files Browse the repository at this point in the history
The code flow in btrfs_new_inode allows for btrfs_evict_inode to be
called with not fully initialised inode (e.g. ->root member not
being set). This can happen when btrfs_set_inode_index in
btrfs_new_inode fails, which in turn would call iput for the newly
allocated inode. This in turn leads to vfs calling into btrfs_evict_inode.
This leads to null pointer dereference. To handle this situation check whether
the passed inode has root set and just free it in case it doesn't.

Signed-off-by: Nikolay Borisov <kernel@kyup.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Nikolay Borisov authored and David Sterba committed Jul 26, 2016
1 parent fb770ae commit 3d48d98
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -5159,11 +5159,18 @@ void btrfs_evict_inode(struct inode *inode)
struct btrfs_root *root = BTRFS_I(inode)->root;
struct btrfs_block_rsv *rsv, *global_rsv;
int steal_from_global = 0;
u64 min_size = btrfs_calc_trunc_metadata_size(root, 1);
u64 min_size;
int ret;

trace_btrfs_inode_evict(inode);

if (!root) {
kmem_cache_free(btrfs_inode_cachep, BTRFS_I(inode));
return;
}

min_size = btrfs_calc_trunc_metadata_size(root, 1);

evict_inode_truncate_pages(inode);

if (inode->i_nlink &&
Expand Down

0 comments on commit 3d48d98

Please sign in to comment.