iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: release kobject/kset even when init/register fail

Browse Source 
Even when kobject_init_and_add/kset_register fail, the kobject has been
already initialized and the refcount set to 1. Thus it is necessary to
release the kobject/kset, to avoid the memory associated with it hanging
around forever.

Signed-off-by: Riccardo Schirone <sirmy15@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Riccardo Schirone 2018-01-11 14:28:13 -05:00 committed by Theodore Ts'o
parent a794df0ecd
commit 95c4df0293
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/ext4/sysfs.c
View File

@ -396,8 +396,11 @@ int ext4_register_sysfs(struct super_block *sb)
init_completion(&sbi->s_kobj_unregister); init_completion(&sbi->s_kobj_unregister);
err = kobject_init_and_add(&sbi->s_kobj, &ext4_sb_ktype, NULL, err = kobject_init_and_add(&sbi->s_kobj, &ext4_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 (ext4_proc_root) if (ext4_proc_root)
sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root); sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root);
@ -430,15 +433,19 @@ int __init ext4_init_sysfs(void)
kobject_set_name(&ext4_kset.kobj, "ext4"); kobject_set_name(&ext4_kset.kobj, "ext4");
ext4_kset.kobj.parent = fs_kobj; ext4_kset.kobj.parent = fs_kobj;
ret = kset_register(&ext4_kset); ret = kset_register(&ext4_kset);
if (ret) if (ret) {
kset_unregister(&ext4_kset);
return ret; return ret;
}
ret = kobject_init_and_add(&ext4_feat, &ext4_feat_ktype, ret = kobject_init_and_add(&ext4_feat, &ext4_feat_ktype,
NULL, "features"); NULL, "features");
if (ret) if (ret) {
kobject_put(&ext4_feat);
kset_unregister(&ext4_kset); kset_unregister(&ext4_kset);
else } else {
ext4_proc_root = proc_mkdir(proc_dirname, NULL); ext4_proc_root = proc_mkdir(proc_dirname, NULL);
}
return ret; return ret;
} }