Commit 3a496b00 authored by David Daney's avatar David Daney Committed by Rob Herring

of/address: Don't loop forever in of_find_matching_node_by_address().

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: default avatarDavid Daney <david.daney@cavium.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 068627a5
...@@ -845,10 +845,10 @@ struct device_node *of_find_matching_node_by_address(struct device_node *from, ...@@ -845,10 +845,10 @@ struct device_node *of_find_matching_node_by_address(struct device_node *from,
struct resource res; struct resource res;
while (dn) { while (dn) {
if (of_address_to_resource(dn, 0, &res)) if (!of_address_to_resource(dn, 0, &res) &&
continue; res.start == base_address)
if (res.start == base_address)
return dn; return dn;
dn = of_find_matching_node(dn, matches); dn = of_find_matching_node(dn, matches);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment