| From 450ff8348808a89cc27436771aa05c2b90c0eef1 Mon Sep 17 00:00:00 2001 |
| From: "Tobin C. Harding" <tobin@kernel.org> |
| Date: Mon, 13 May 2019 13:39:11 +1000 |
| Subject: btrfs: sysfs: Fix error path kobject memory leak |
| |
| From: Tobin C. Harding <tobin@kernel.org> |
| |
| commit 450ff8348808a89cc27436771aa05c2b90c0eef1 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/btrfs/extent-tree.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/fs/btrfs/extent-tree.c |
| +++ b/fs/btrfs/extent-tree.c |
| @@ -3981,8 +3981,7 @@ static int create_space_info(struct btrf |
| 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; |
| } |
| |