mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 09:13:55 +08:00
kobject: Restore old behaviour of kobject_del(NULL)
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
4965b8cd1b
commit
40b8b826a6
@ -637,8 +637,12 @@ static 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_put(parent);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user