kobject: Restore old behaviour of kobject_del(NULL)
Subsystems (2)
PATCH 1/1 kobject: Restore old behaviour of kobject_del(NULL)
The commit 079ad2fb4bf9 ("kobject: Avoid premature parent object freeing in kobject_cleanup()") inadvertently dropped a possibility to call kobject_del() with NULL pointer. Restore the old behaviour.
Fixes 079ad2fb4bf9 ("kobject: Avoid premature parent object freeing in kobject_cleanup()")
Reported-by Qu Wenruo <[email protected]>
Cc Heikki Krogerus <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
--- lib/kobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject.c +1 -1
@@ -637,7 +637,7 @@ static void __kobject_del(struct kobject *kobj)*/ void kobject_del (struct kobject *kobj) { -struct kobject *parent = kobj->parent; +struct kobject *parent = kobj ? kobj->parent :NULL ;__kobject_del (kobj);kobject_put (parent);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerQuoted 17 lines · Andy Shevchenko
The commit
079ad2fb4bf9("kobject: Avoid premature parent object freeing inkobject_cleanup()") inadvertently dropped a possibility to callkobject_del()with NULL pointer. Restore the old behaviour.Fixes 079ad2fb4bf9 ("kobject: Avoid premature parent object freeing in kobject_cleanup()")Reported-by Qu Wenruo <[email protected]>Cc Heikki Krogerus <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- lib/kobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/kobject.c +0
-0
lib/kobject.c static void __kobject_del(struct kobject *kobj) · line 640
Quoted 5 lines
lib/kobject.c +1
-1@@ -637,7 +637,7 @@ static void __kobject_del(struct kobject *kobj)*/ void kobject_del (struct kobject *kobj) { -struct kobject *parent = kobj->parent; +struct kobject *parent = kobj ? kobj->parent :NULL ;
I _HATE_ "? :" logic, and it obscures the logic in this function, just add a simple:
if (!kobj) return;
to this function please.
thanks,
greg k-h