Commit 40b8b826 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

kobject: Restore old behaviour of kobject_del(NULL)

The commit 079ad2fb ("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: 079ad2fb ("kobject: Avoid premature parent object freeing in kobject_cleanup()")
Cc: stable <stable@vger.kernel.org>
Reported-by: default avatarQu Wenruo <quwenruo.btrfs@gmx.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Link: https://lore.kernel.org/r/20200803082706.65347-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4965b8cd
...@@ -637,8 +637,12 @@ static void __kobject_del(struct kobject *kobj) ...@@ -637,8 +637,12 @@ static void __kobject_del(struct kobject *kobj)
*/ */
void kobject_del(struct kobject *kobj) void kobject_del(struct kobject *kobj)
{ {
struct kobject *parent = kobj->parent; struct kobject *parent;
if (!kobj)
return;
parent = kobj->parent;
__kobject_del(kobj); __kobject_del(kobj);
kobject_put(parent); kobject_put(parent);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment