* [PATCH v1] kobject: Restore old behaviour of kobject_del(NULL)
@ 2020-08-03 7:38 Andy Shevchenko
2020-08-03 8:13 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2020-08-03 7:38 UTC (permalink / raw)
To: Greg Kroah-Hartman, linux-kernel, Rafael J. Wysocki
Cc: Andy Shevchenko, Qu Wenruo, Heikki Krogerus
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;
__kobject_del(kobj);
kobject_put(parent);
--
2.27.0
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v1] kobject: Restore old behaviour of kobject_del(NULL)
2020-08-03 7:38 [PATCH v1] kobject: Restore old behaviour of kobject_del(NULL) Andy Shevchenko
@ 2020-08-03 8:13 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2020-08-03 8:13 UTC (permalink / raw)
To: Andy Shevchenko
Cc: linux-kernel, Rafael J. Wysocki, Qu Wenruo, Heikki Krogerus
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-03 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-03 7:38 [PATCH v1] kobject: Restore old behaviour of kobject_del(NULL) Andy Shevchenko
2020-08-03 8:13 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®