From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbaFODjJ (ORCPT ); Sat, 14 Jun 2014 23:39:09 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:33589 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762AbaFODjH (ORCPT ); Sat, 14 Jun 2014 23:39:07 -0400 Message-ID: <539D1559.8080603@gmail.com> Date: Sat, 14 Jun 2014 20:39:05 -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: frowand.list@gmail.com CC: Grant Likely , Pantelis Antoniou , Rob Herring , Rob Herring , "devicetree@vger.kernel.org" , Linux Kernel list Subject: Re: [RFC PATCH] OF: fix of_find_node_by_path() assumption that of_allnodes is root References: <539A91E2.7000606@gmail.com> <539D14CA.1060105@gmail.com> In-Reply-To: <539D14CA.1060105@gmail.com> 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 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 Reported-by: pantelis.antoniou@konsulko.com Signed-off-by: Frank Rowand --- v2: Remove change to function header, no longer needed. Remove BUG_ON(), no longer needed. Add np as np->parent->allnext instead of np->parent->allnext, as suggested by Grant Likely. drivers/of/base.c | 4 2 + 2 - 0 ! 1 file changed, 2 insertions(+), 2 deletions(-) Index: b/drivers/of/base.c =================================================================== --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1960,9 +1960,9 @@ int of_attach_node(struct device_node *n raw_spin_lock_irqsave(&devtree_lock, flags); np->sibling = np->parent->child; - np->allnext = of_allnodes; + np->allnext = np->parent->allnext; + np->parent->allnext = np; np->parent->child = np; - of_allnodes = np; of_node_clear_flag(np, OF_DETACHED); raw_spin_unlock_irqrestore(&devtree_lock, flags); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frank Rowand Subject: Re: [RFC PATCH] OF: fix of_find_node_by_path() assumption that of_allnodes is root Date: Sat, 14 Jun 2014 20:39:05 -0700 Message-ID: <539D1559.8080603@gmail.com> References: <539A91E2.7000606@gmail.com> <539D14CA.1060105@gmail.com> Reply-To: frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <539D14CA.1060105-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Grant Likely , Pantelis Antoniou , Rob Herring , Rob Herring , "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Linux Kernel list List-Id: devicetree@vger.kernel.org From: Frank Rowand 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 Reported-by: pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org Signed-off-by: Frank Rowand --- v2: Remove change to function header, no longer needed. Remove BUG_ON(), no longer needed. Add np as np->parent->allnext instead of np->parent->allnext, as suggested by Grant Likely. drivers/of/base.c | 4 2 + 2 - 0 ! 1 file changed, 2 insertions(+), 2 deletions(-) Index: b/drivers/of/base.c =================================================================== --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1960,9 +1960,9 @@ int of_attach_node(struct device_node *n raw_spin_lock_irqsave(&devtree_lock, flags); np->sibling = np->parent->child; - np->allnext = of_allnodes; + np->allnext = np->parent->allnext; + np->parent->allnext = np; np->parent->child = np; - of_allnodes = np; of_node_clear_flag(np, OF_DETACHED); raw_spin_unlock_irqrestore(&devtree_lock, flags); -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html