From: Frank Rowand <frank.row...@sonymobile.com>

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.anton...@konsulko.com
Signed-off-by: Frank Rowand <frank.row...@sonymobile.com>
---

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 linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to