Skip to content

Commit

Permalink
of/address: Don't loop forever in of_find_matching_node_by_address().
Browse files Browse the repository at this point in the history
If the internal call to of_address_to_resource() fails, we end up
looping forever in of_find_matching_node_by_address().  This can be
caused by a defective device tree, or calling with an incorrect
matches argument.

Fix by calling of_find_matching_node() unconditionally at the end of
the loop.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
David Daney authored and Rob Herring committed Aug 25, 2015
1 parent 068627a commit 3a496b0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/of/address.c
Original file line number Diff line number Diff line change
Expand Up @@ -845,10 +845,10 @@ struct device_node *of_find_matching_node_by_address(struct device_node *from,
struct resource res;

while (dn) {
if (of_address_to_resource(dn, 0, &res))
continue;
if (res.start == base_address)
if (!of_address_to_resource(dn, 0, &res) &&
res.start == base_address)
return dn;

dn = of_find_matching_node(dn, matches);
}

Expand Down

0 comments on commit 3a496b0

Please sign in to comment.