Commit dc5fa2ca authored by Chao Yu's avatar Chao Yu Committed by Greg Kroah-Hartman

f2fs: fix memleak of kobject

[ Upstream commit fe396ad8 ]

If kobject_init_and_add() failed, caller needs to invoke kobject_put()
to release kobject explicitly.
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c2913e2c
...@@ -658,10 +658,12 @@ int __init f2fs_init_sysfs(void) ...@@ -658,10 +658,12 @@ int __init f2fs_init_sysfs(void)
ret = kobject_init_and_add(&f2fs_feat, &f2fs_feat_ktype, ret = kobject_init_and_add(&f2fs_feat, &f2fs_feat_ktype,
NULL, "features"); NULL, "features");
if (ret) if (ret) {
kobject_put(&f2fs_feat);
kset_unregister(&f2fs_kset); kset_unregister(&f2fs_kset);
else } else {
f2fs_proc_root = proc_mkdir("fs/f2fs", NULL); f2fs_proc_root = proc_mkdir("fs/f2fs", NULL);
}
return ret; return ret;
} }
...@@ -682,8 +684,11 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi) ...@@ -682,8 +684,11 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)
init_completion(&sbi->s_kobj_unregister); init_completion(&sbi->s_kobj_unregister);
err = kobject_init_and_add(&sbi->s_kobj, &f2fs_sb_ktype, NULL, err = kobject_init_and_add(&sbi->s_kobj, &f2fs_sb_ktype, NULL,
"%s", sb->s_id); "%s", sb->s_id);
if (err) if (err) {
kobject_put(&sbi->s_kobj);
wait_for_completion(&sbi->s_kobj_unregister);
return err; return err;
}
if (f2fs_proc_root) if (f2fs_proc_root)
sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root); sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment