diff options
| author | David Daney <david.daney@cavium.com> | 2015-08-19 13:17:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-21 10:00:09 -0700 |
| commit | 5d6daec041e51567b7492eac66a1e7f9755f251b (patch) | |
| tree | 80e990b0fb3b0c6e717c49aa823f6ff6af4812e3 | |
| parent | 6fdfca2c195b40993d75246991a1fe55602ee617 (diff) | |
| download | lwn-5d6daec041e51567b7492eac66a1e7f9755f251b.tar.gz lwn-5d6daec041e51567b7492eac66a1e7f9755f251b.zip | |
of/address: Don't loop forever in of_find_matching_node_by_address().
commit 3a496b00b6f90c41bd21a410871dfc97d4f3c7ab upstream.
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>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/of/address.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 8fb2b5769733..9ceff3c86d74 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -629,10 +629,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); } |