On Mon, Sep 14, 2020 at 04:13:18PM +0200, Greg Kroah-Hartman wrote:
On Mon, Sep 14, 2020 at 09:05:20AM -0400, Sasha Levin wrote:
From: Andy Shevchenko andriy.shevchenko@linux.intel.com
[ Upstream commit 07ecc6693f9157cf293da5d165c73fb28fd69bf4 ]
__kobject_del() is called from two places, in one where kobj is dereferenced before and thus can't be NULL, and in the other the NULL check is done before call. Drop unneeded conditional in __kobject_del().
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Reviewed-by: Rafael J. Wysocki rafael.j.wysocki@intel.com Link: https://lore.kernel.org/r/20200803083520.5460-1-andriy.shevchenko@linux.inte... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Sasha Levin sashal@kernel.org
lib/kobject.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/lib/kobject.c b/lib/kobject.c index bbbb067de8ecd..e02f1bb67c99f 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -568,9 +568,6 @@ void kobject_del(struct kobject *kobj) { struct kernfs_node *sd;
- if (!kobj)
return;- sd = kobj->sd; sysfs_remove_dir(kobj); sysfs_put(sd);
-- 2.25.1
Ouch, no, this patch should not be backported ANYWHERE or bad things will happen.
Please drop from all AUTOSEL trees.
Dropped, thanks!