summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNanyong Sun <sunnanyong@huawei.com>2021-09-07 20:00:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-26 13:39:49 +0200
commitc55c9e1f56d4ba3f669d25a8d9a27f6f21b320e2 (patch)
treea942088bb68d8184d993bd9f5c04f46e14454acb
parenta37b7ae1ec75a62e0a0bf8c75d5df24aa087842b (diff)
downloadlinux-stable-c55c9e1f56d4ba3f669d25a8d9a27f6f21b320e2.tar.gz
linux-stable-c55c9e1f56d4ba3f669d25a8d9a27f6f21b320e2.tar.bz2
linux-stable-c55c9e1f56d4ba3f669d25a8d9a27f6f21b320e2.zip
nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
[ 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>
-rw-r--r--fs/nilfs2/sysfs.c4
1 files 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)