summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorTobin C. Harding2019-05-13 05:39:11 +0200
committerDavid Sterba2019-05-16 14:31:01 +0200
commit450ff8348808a89cc27436771aa05c2b90c0eef1 (patch)
treef3b1626d7b2620b987f9d0f2f06783fdf228466b /fs/btrfs
parentBtrfs: do not abort transaction at btrfs_update_root() after failure to COW path (diff)
downloadkernel-qcow2-linux-450ff8348808a89cc27436771aa05c2b90c0eef1.tar.gz
kernel-qcow2-linux-450ff8348808a89cc27436771aa05c2b90c0eef1.tar.xz
kernel-qcow2-linux-450ff8348808a89cc27436771aa05c2b90c0eef1.zip
btrfs: sysfs: Fix error path kobject memory leak
If a call to kobject_init_and_add() fails we must call kobject_put() otherwise we leak memory. Calling kobject_put() when kobject_init_and_add() fails drops the refcount back to 0 and calls the ktype release method (which in turn calls the percpu destroy and kfree). Add call to kobject_put() in the error path of call to kobject_init_and_add(). Cc: stable@vger.kernel.org # v4.4+ Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Tobin C. Harding <tobin@kernel.org> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/extent-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index f79e477a378e..9bcb3570750e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3882,8 +3882,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)
info->space_info_kobj, "%s",
alloc_name(space_info->flags));
if (ret) {
- percpu_counter_destroy(&space_info->total_bytes_pinned);
- kfree(space_info);
+ kobject_put(&space_info->kobj);
return ret;
}