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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 D61B1C43461 for ; Tue, 15 Sep 2020 23:55:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E99A20720 for ; Tue, 15 Sep 2020 23:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600214107; bh=ifnurhpycPLGZeFJBQdmcEfPl/nA6hUm+yrAbyQdj3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=feKlMKuUjfSyyXPazb34ZMfPpcin1M9fcR/1UsOzBPaTEGwQvb6I4epo/d6M41GvU mSfr0j9AwD38cG+pa+P2ZuPBpuFFYTcpVDZS8y3JSqXVOfpIyvObXj+EQgfb8SUdws 6ojB9g+JWP0wnilMH0fbFBgZk21NRkxhHWAKcN1o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727219AbgIOXzA (ORCPT ); Tue, 15 Sep 2020 19:55:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:43012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727054AbgIOObc (ORCPT ); Tue, 15 Sep 2020 10:31:32 -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 3D57A22272; Tue, 15 Sep 2020 14:23:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179803; bh=ifnurhpycPLGZeFJBQdmcEfPl/nA6hUm+yrAbyQdj3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QI0wI9nbvhNFHclCHyY4Wi4Qw0o6X3I562xWDtrNKjRNPJFuGZPjGairFkVvFWKKU 6hK1OW9x9QuI8eNL2xPItI9i67VKoEiEpWJy/e0D1s+qzAvh+3IOh43ilNy2nksGyE LjY4HOJQb6Rq77rP+pd4MfUmbefQtFF+RqYN5tsk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qu Wenruo , Heikki Krogerus , Andy Shevchenko , Qu Wenruo Subject: [PATCH 5.4 095/132] kobject: Restore old behaviour of kobject_del(NULL) Date: Tue, 15 Sep 2020 16:13:17 +0200 Message-Id: <20200915140648.902771537@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140644.037604909@linuxfoundation.org> References: <20200915140644.037604909@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Shevchenko commit 40b8b826a6998639dd1c26f0e127f18371e1058d upstream. 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()") Cc: stable Reported-by: Qu Wenruo Cc: Heikki Krogerus Signed-off-by: Andy Shevchenko Reviewed-by: Qu Wenruo Link: https://lore.kernel.org/r/20200803082706.65347-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- lib/kobject.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/lib/kobject.c +++ b/lib/kobject.c @@ -630,8 +630,12 @@ static void __kobject_del(struct kobject */ 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); }