From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752121AbaFMFxp (ORCPT ); Fri, 13 Jun 2014 01:53:45 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:35944 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751439AbaFMFxn (ORCPT ); Fri, 13 Jun 2014 01:53:43 -0400 Message-ID: <539A91E2.7000606@gmail.com> Date: Thu, 12 Jun 2014 22:53:38 -0700 From: Frank Rowand Reply-To: frowand.list@gmail.com User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Pantelis Antoniou , Grant Likely , Rob Herring , "devicetree@vger.kernel.org" , Linux Kernel list Subject: [RFC PATCH] OF: fix of_find_node_by_path() assumption that of_allnodes is root Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frank Rowand Pantelis Antoniou reports that of_find_node_by_path() is borked because of_allnodes is not guaranteed to contain the root of the tree after using any of the dynamic update functions because some other nodes ends up as of_allnodes. Fixes: c22e650e66b8 of: Make of_find_node_by_path() handle /aliases Signed-off-by: Frank Rowand --- Pantelis, Can you test whether the problem you reported in irc? This patch has not been tested, not even compile tested. drivers/of/base.c | 8 6 + 2 - 0 ! 1 file changed, 6 insertions(+), 2 deletions(-) Index: b/drivers/of/base.c =================================================================== --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1948,6 +1948,9 @@ int of_reconfig_notify(unsigned long act /** * of_attach_node - Plug a device node into the tree and global list. + * + * Put the device node after of_allnodes in the global list so that + * of_allnodes remains the root. */ int of_attach_node(struct device_node *np) { @@ -1958,11 +1961,12 @@ int of_attach_node(struct device_node *n if (rc) return rc; + BUG_ON(!of_allnodes); raw_spin_lock_irqsave(&devtree_lock, flags); np->sibling = np->parent->child; - np->allnext = of_allnodes; + np->allnext = of_allnodes->allnext; np->parent->child = np; - of_allnodes = np; + of_allnodes->allnext = np; of_node_clear_flag(np, OF_DETACHED); raw_spin_unlock_irqrestore(&devtree_lock, flags);