Skip to content

Commit

Permalink
btrfs: fix potential oops in device_list_add
Browse files Browse the repository at this point in the history
alloc_fs_devices() can return ERR_PTR(-ENOMEM), so dereferencing its
result before the check for IS_ERR() is a bad idea.

Fixes: d1a6300 ("btrfs: add members to fs_devices to track fsid changes")
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Al Viro authored and David Sterba committed Jan 30, 2019
1 parent 302167c commit 92900e5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -957,11 +957,11 @@ static noinline struct btrfs_device *device_list_add(const char *path,
else
fs_devices = alloc_fs_devices(disk_super->fsid, NULL);

fs_devices->fsid_change = fsid_change_in_progress;

if (IS_ERR(fs_devices))
return ERR_CAST(fs_devices);

fs_devices->fsid_change = fsid_change_in_progress;

mutex_lock(&fs_devices->device_list_mutex);
list_add(&fs_devices->fs_list, &fs_uuids);

Expand Down

0 comments on commit 92900e5

Please sign in to comment.