From patchwork Tue Nov 3 20:37:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 316846 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=-9.8 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=unavailable 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 11098C388F9 for ; Tue, 3 Nov 2020 21:46:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B2D4E2236F for ; Tue, 3 Nov 2020 21:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604439981; bh=KIGoCyRaaMzjAcBz2Y6Mpoq76CMr2rKg+zblVGe55to=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Na1qRPS2PQ+xiqGlR31+oi6BID9DH67YhnIDQNfvPsO4aWv8CFcIjgvhmnl0FX4HG 0Y2+uQcfvfE5G8aQc+a8561AJYTga3N+YrRnuewhe5ag8iOILddk8P2yjcPgNlVmrY Fyv8BkGGPij7++w3wqGMd8e0Qn5DkLrlq5KVusLk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732051AbgKCUwN (ORCPT ); Tue, 3 Nov 2020 15:52:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:48406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732047AbgKCUwM (ORCPT ); Tue, 3 Nov 2020 15:52:12 -0500 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 149EB2071E; Tue, 3 Nov 2020 20:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436731; bh=KIGoCyRaaMzjAcBz2Y6Mpoq76CMr2rKg+zblVGe55to=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hvwA7a2uulpL3OxbCSW/cmzaKoR5I3x7dILFJpDJQnh56UyuualITo9n7Sfp3O1A9 YjKvwao0cSgN3vDwfeBNzg7vmZ0cdxbEYoL5JRhZ7D5zFYGGiIG7uCy+RmJoyLhkeH JenwPVjXawHyewfolofcJS7OYSCD+9lqJO+vXHQc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ferry Toth , Andy Shevchenko , Heikki Krogerus , "Rafael J. Wysocki" Subject: [PATCH 5.9 377/391] device property: Dont clear secondary pointer for shared primary firmware node Date: Tue, 3 Nov 2020 21:37:08 +0100 Message-Id: <20201103203412.602482939@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Shevchenko commit 99aed9227073fb34ce2880cbc7063e04185a65e1 upstream. It appears that firmware nodes can be shared between devices. In such case when a (child) device is about to be deleted, its firmware node may be shared and ACPI_COMPANION_SET(..., NULL) call for it breaks the secondary link of the shared primary firmware node. In order to prevent that, check, if the device has a parent and parent's firmware node is shared with its child, and avoid crashing the link. Fixes: c15e1bdda436 ("device property: Fix the secondary firmware node handling in set_primary_fwnode()") Reported-by: Ferry Toth Signed-off-by: Andy Shevchenko Reviewed-by: Heikki Krogerus Tested-by: Ferry Toth Cc: 5.9+ # 5.9+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/base/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4260,6 +4260,7 @@ static inline bool fwnode_is_primary(str */ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) { + struct device *parent = dev->parent; struct fwnode_handle *fn = dev->fwnode; if (fwnode) { @@ -4274,7 +4275,8 @@ void set_primary_fwnode(struct device *d } else { if (fwnode_is_primary(fn)) { dev->fwnode = fn->secondary; - fn->secondary = ERR_PTR(-ENODEV); + if (!(parent && fn == parent->fwnode)) + fn->secondary = ERR_PTR(-ENODEV); } else { dev->fwnode = NULL; }