Skip to content

Commit 3f487be

Browse files
lgs2513kdave
authored andcommitted
btrfs: fix double free in create_space_info() error path
When kobject_init_and_add() fails, the call chain is: create_space_info() -> btrfs_sysfs_add_space_info_type() -> kobject_init_and_add() -> failure -> kobject_put(&space_info->kobj) -> space_info_release() -> kfree(space_info) Then control returns to create_space_info(): btrfs_sysfs_add_space_info_type() returns error -> goto out_free -> kfree(space_info) This causes a double free. Keep the direct kfree(space_info) for the earlier failure path, but after btrfs_sysfs_add_space_info_type() has called kobject_put(), let the kobject release callback handle the cleanup. Fixes: a11224a ("btrfs: fix memory leaks in create_space_info() error paths") CC: stable@vger.kernel.org # 6.19+ Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Guangshuo Li <lgs201920130244@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent a7449ed commit 3f487be

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/btrfs/space-info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
320320

321321
ret = btrfs_sysfs_add_space_info_type(space_info);
322322
if (ret)
323-
goto out_free;
323+
return ret;
324324

325325
list_add(&space_info->list, &info->space_info);
326326
if (flags & BTRFS_BLOCK_GROUP_DATA)

0 commit comments

Comments
 (0)