Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80a70145 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix memleak of kobject 



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>
parent abae9d62

fs/f2fs/sysfs.c

+8 −3
Original line number Diff line number Diff line
@@ -740,10 +740,12 @@ int __init f2fs_init_sysfs(void) 


	ret = kobject_init_and_add(&f2fs_feat, &f2fs_feat_ktype,

				   NULL, "features");

	if (ret)

	if (ret) {

		kobject_put(&f2fs_feat);

		kset_unregister(&f2fs_kset);

	else

	} else {

		f2fs_proc_root = proc_mkdir("fs/f2fs", NULL);

	}

	return ret;

}
@@ -764,8 +766,11 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi) 
	init_completion(&sbi->s_kobj_unregister);

	err = kobject_init_and_add(&sbi->s_kobj, &f2fs_sb_ktype, NULL,

				"%s", sb->s_id);

	if (err)

	if (err) {

		kobject_put(&sbi->s_kobj);

		wait_for_completion(&sbi->s_kobj_unregister);

		return err;

	}



	if (f2fs_proc_root)

		sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);