Skip to content

Commit 1a77288

Browse files
Zhen Leigregkh
authored andcommitted
kobject: Add sanity check for kset->kobj.ktype in kset_register()
[ Upstream commit 4d0fe8c ] When I register a kset in the following way: static struct kset my_kset; kobject_set_name(&my_kset.kobj, "my_kset"); ret = kset_register(&my_kset); A null pointer dereference exception is occurred: [ 4453.568337] Unable to handle kernel NULL pointer dereference at \ virtual address 0000000000000028 ... ... [ 4453.810361] Call trace: [ 4453.813062] kobject_get_ownership+0xc/0x34 [ 4453.817493] kobject_add_internal+0x98/0x274 [ 4453.822005] kset_register+0x5c/0xb4 [ 4453.825820] my_kobj_init+0x44/0x1000 [my_kset] ... ... Because I didn't initialize my_kset.kobj.ktype. According to the description in Documentation/core-api/kobject.rst: - A ktype is the type of object that embeds a kobject. Every structure that embeds a kobject needs a corresponding ktype. So add sanity check to make sure kset->kobj.ktype is not NULL. Signed-off-by: Zhen Lei <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 8c49f01 commit 1a77288

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

lib/kobject.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,11 @@ int kset_register(struct kset *k)
854854
if (!k)
855855
return -EINVAL;
856856

857+
if (!k->kobj.ktype) {
858+
pr_err("must have a ktype to be initialized properly!\n");
859+
return -EINVAL;
860+
}
861+
857862
kset_init(k);
858863
err = kobject_add_internal(&k->kobj);
859864
if (err) {

0 commit comments

Comments
 (0)