Skip to contentSkip to conversation

kobject: Restore old behaviour of kobject_del(NULL)

PATCH Superseded Andy Shevchenko 2 participants 2 messages Aug 3, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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()")
Cc Heikki Krogerus <[email protected]>
---
 lib/kobject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject.c +1 -1
index 3afb939f2a1c..f5f5273031d2 100644
@@ -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
#1 lore raw
Quoted 17 lines · Andy Shevchenko

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()")
Cc Heikki Krogerus <[email protected]>
---
 lib/kobject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject.c +0 -0
index 3afb939f2a1c..f5f5273031d2 100644

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