From: Andy Shevchenko <[email protected]>
commit 40b8b826a6998639dd1c26f0e127f18371e1058d upstream.
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: stable <[email protected]>
Reported-by: Qu Wenruo <[email protected]>
Cc: Heikki Krogerus <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
Reviewed-by: Qu Wenruo <[email protected]>
Link:
https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
lib/kobject.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -637,8 +637,12 @@ static void __kobject_del(struct kobject
*/
void kobject_del(struct kobject *kobj)
{
- struct kobject *parent = kobj->parent;
+ struct kobject *parent;
+ if (!kobj)
+ return;
+
+ parent = kobj->parent;
__kobject_del(kobj);
kobject_put(parent);
}
