Skip to content

Commit

Permalink
[SPARC64]: Fix recursion in PROM tree building.
Browse files Browse the repository at this point in the history
Use iteration for scanning of PROM node siblings.

Based upon a patch by Greg Onufer, who found this bug.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 10, 2007
1 parent 7cc5c85 commit aa5242e
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions arch/sparc64/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1636,10 +1636,21 @@ static struct device_node * __init create_node(phandle node, struct device_node

static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)
{
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;

dp = create_node(node, parent);
if (dp) {
while (1) {
dp = create_node(node, parent);
if (!dp)
break;

if (prev_sibling)
prev_sibling->sibling = dp;

if (!ret)
ret = dp;
prev_sibling = dp;

*(*nextp) = dp;
*nextp = &dp->allnext;

Expand All @@ -1648,10 +1659,10 @@ static struct device_node * __init build_tree(struct device_node *parent, phandl

dp->child = build_tree(dp, prom_getchild(node), nextp);

dp->sibling = build_tree(parent, prom_getsibling(node), nextp);
node = prom_getsibling(node);
}

return dp;
return ret;
}

void __init prom_build_devicetree(void)
Expand Down

0 comments on commit aa5242e

Please sign in to comment.