kobject: Restore old behaviour of kobject_del(NULL)
commit40b8b826a6
upstream. The commit079ad2fb4b
("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:079ad2fb4b
("kobject: Avoid premature parent object freeing in kobject_cleanup()") Cc: stable <stable@vger.kernel.org> Reported-by: Qu Wenruo <quwenruo.btrfs@gmx.com> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Link: https://lore.kernel.org/r/20200803082706.65347-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b85c64a716
commit
b9fb631f6b
|
@ -630,8 +630,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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue