The preivous commit 8fd0c1b0647a ("nilfs2: fix memory leak in
nilfs_sysfs_delete_device_group") only handles the memory leak in the
nilfs_sysfs_delete_device_group. However, the similar memory leak still
occurs in the nilfs_sysfs_create_device_group.
Fix it by adding kobject_del when
kobject_init_and_add succeeds, but one of the following calls fails.
Fixes: 8fd0c1b0647a ("nilfs2: fix memory leak in nilfs_sysfs_delete_device_group")
Signed-off-by: Dongliang Mu <dzm91@xxxxxxxxxxx>
---
fs/nilfs2/sysfs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index 379d22e28ed6..0b2db2b499d5 100644
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -995,7 +995,7 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
err = nilfs_sysfs_create_mounted_snapshots_group(nilfs);
if (err)
- goto cleanup_dev_kobject;
+ goto delete_dev_kobject;
err = nilfs_sysfs_create_checkpoints_group(nilfs);
if (err)
@@ -1027,6 +1027,9 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
delete_mounted_snapshots_group:
nilfs_sysfs_delete_mounted_snapshots_group(nilfs);
+delete_dev_kobject:
+ kobject_del(&nilfs->ns_dev_kobj);
+
cleanup_dev_kobject:
kobject_put(&nilfs->ns_dev_kobj);
kfree(nilfs->ns_dev_subgroups);
--
2.25.1
