From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19A81C2D0E1 for ; Mon, 14 Sep 2020 14:14:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CFA7E2193E for ; Mon, 14 Sep 2020 14:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600092854; bh=FGlsUO6K3vXLOU4PWqtM6gGNX2attlS3FySkPzib+Dc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=z0hxbtd96NdGl3ZWune2w2y+JZM1OT9dMCeO1lvYKrG+SmSzAo0dV+ezEm7cMhwu5 IWB/jIwUwydW1EiUepCrDppYev8yz4SkxUvmvE+YUrMuaIQUxqfQQClyNZboS1mYBZ 1eI0mFopwVrwtEo2VQ1swXfUUs7y0DLFwnNEWGmQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726814AbgINOOM (ORCPT ); Mon, 14 Sep 2020 10:14:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:37340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726545AbgINOOA (ORCPT ); Mon, 14 Sep 2020 10:14:00 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1D4620672; Mon, 14 Sep 2020 14:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600092799; bh=FGlsUO6K3vXLOU4PWqtM6gGNX2attlS3FySkPzib+Dc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Dq59qUsUbToOtJ1Z8jMPEZ8RJSeHm9u2FAKFsBu62F30wCyoYZIIf/35wTxKvrVNO VXzd5/AmOxOkzRnsi1nT4FNOAD22HJrhTU6KAVUmY/TVQm3KhVehAQ0YPyyLQAwWdT RB9MdIsSNz4LeFh8U6UcTETGB9qSxcKlt/2TKXjA= Date: Mon, 14 Sep 2020 16:13:18 +0200 From: Greg Kroah-Hartman To: Sasha Levin Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Andy Shevchenko , "Rafael J . Wysocki" Subject: Re: [PATCH AUTOSEL 4.14 09/15] kobject: Drop unneeded conditional in __kobject_del() Message-ID: <20200914141318.GA3357018@kroah.com> References: <20200914130526.1804913-1-sashal@kernel.org> <20200914130526.1804913-9-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200914130526.1804913-9-sashal@kernel.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Sep 14, 2020 at 09:05:20AM -0400, Sasha Levin wrote: > From: Andy Shevchenko > > [ 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 > Reviewed-by: Rafael J. Wysocki > Link: https://lore.kernel.org/r/20200803083520.5460-1-andriy.shevchenko@linux.intel.com > Signed-off-by: Greg Kroah-Hartman > Signed-off-by: Sasha Levin > --- > 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. thanks, greg k-h