| From 39aaf6132ce6786e73fdcd379b9fdef06aa98f19 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 7 Sep 2021 20:00:21 -0700 |
| Subject: nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group |
| |
| From: Nanyong Sun <sunnanyong@huawei.com> |
| |
| [ Upstream commit b2fe39c248f3fa4bbb2a20759b4fdd83504190f7 ] |
| |
| If kobject_init_and_add returns with error, kobject_put() is needed here |
| to avoid memory leak, because kobject_init_and_add may return error |
| without freeing the memory associated with the kobject it allocated. |
| |
| Link: https://lkml.kernel.org/r/20210629022556.3985106-6-sunnanyong@huawei.com |
| Link: https://lkml.kernel.org/r/1625651306-10829-6-git-send-email-konishi.ryusuke@gmail.com |
| Signed-off-by: Nanyong Sun <sunnanyong@huawei.com> |
| Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/nilfs2/sysfs.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c |
| index 195f42192a15..6c92ac314b06 100644 |
| --- a/fs/nilfs2/sysfs.c |
| +++ b/fs/nilfs2/sysfs.c |
| @@ -208,9 +208,9 @@ int nilfs_sysfs_create_snapshot_group(struct nilfs_root *root) |
| } |
| |
| if (err) |
| - return err; |
| + kobject_put(&root->snapshot_kobj); |
| |
| - return 0; |
| + return err; |
| } |
| |
| void nilfs_sysfs_delete_snapshot_group(struct nilfs_root *root) |
| -- |
| 2.33.0 |
| |
