lkml.org 
[lkml]   [2020]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v1] kobject: Restore old behaviour of kobject_del(NULL)
On Mon, Aug 03, 2020 at 10:38:59AM +0300, Andy Shevchenko wrote:
> 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()")
> 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>
> ---
> lib/kobject.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/kobject.c b/lib/kobject.c
> index 3afb939f2a1c..f5f5273031d2 100644
> --- a/lib/kobject.c
> +++ b/lib/kobject.c
> @@ -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

\
 
 \ /
  Last update: 2020-08-03 10:13    [W:0.625 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site