mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
f2fs: fix memleak of kobject
[ Upstream commit fe396ad8e7
]
If kobject_init_and_add() failed, caller needs to invoke kobject_put()
to release kobject explicitly.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
337c7b95e1
commit
225a5b5bee
1 changed files with 8 additions and 3 deletions
|
@ -729,10 +729,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -753,8 +755,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);
|
||||||
|
|
Loading…
Reference in a new issue