btrfs: oops in device_list_add()
PATCH 1/1 btrfs: oops in device_list_add()
alloc_fs_devices() can return ERR_PTR(-ENOMEM), so
dereferencing its result before the check for IS_ERR() is a bad idea...
Fixes d1a63002829a4
Signed-off-by Al Viro <[email protected]>
---
fs/btrfs/volumes.c +2 -2
@@ -955,11 +955,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);
Quoted 6 lines · Al Viro
alloc_fs_devices()can returnERR_PTR(-ENOMEM), so
dereferencing its result before the check forIS_ERR()is a bad idea...Fixes d1a63002829a4Signed-off-by Al Viro <[email protected]>
Thought this was already fixed, doh...
Reviewed-by Nikolay Borisov <[email protected]>
Quoted 20 lines
---
fs/btrfs/volumes.c +2
-2@@ -955,11 +955,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);
Quoted 6 lines · Al Viro
alloc_fs_devices()can returnERR_PTR(-ENOMEM), so
dereferencing its result before the check forIS_ERR()is a bad idea...Fixes d1a63002829a4Signed-off-by Al Viro <[email protected]>
nice catch.
Reviewed-by Anand Jain <[email protected]>
Quoted 20 lines
---
fs/btrfs/volumes.c +2
-2@@ -955,11 +955,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);
Quoted 6 lines · Al Viro
alloc_fs_devices()can returnERR_PTR(-ENOMEM), so
dereferencing its result before the check forIS_ERR()is a bad idea...Fixes d1a63002829a4Signed-off-by Al Viro <[email protected]>
Thanks, added to 5.0-rc queue.