* [PATCH] of/address: Don't loop forever in of_find_matching_node_by_address().
@ 2015-08-19 20:17 David Daney
2015-08-24 15:17 ` Rob Herring
0 siblings, 1 reply; 2+ messages in thread
From: David Daney @ 2015-08-19 20:17 UTC (permalink / raw)
To: linux-kernel, Grant Likely, Rob Herring, devicetree
Cc: Robert Richter, David Daney
From: David Daney <david.daney@cavium.com>
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>
---
drivers/of/address.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 8bfda6a..384574c 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -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);
}
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] of/address: Don't loop forever in of_find_matching_node_by_address().
2015-08-19 20:17 [PATCH] of/address: Don't loop forever in of_find_matching_node_by_address() David Daney
@ 2015-08-24 15:17 ` Rob Herring
0 siblings, 0 replies; 2+ messages in thread
From: Rob Herring @ 2015-08-24 15:17 UTC (permalink / raw)
To: David Daney
Cc: linux-kernel, Grant Likely, Rob Herring, devicetree,
Robert Richter, David Daney
On Wed, Aug 19, 2015 at 3:17 PM, David Daney <ddaney.cavm@gmail.com> wrote:
> From: David Daney <david.daney@cavium.com>
>
> 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>
Applied and tagged for stable. Thanks.
Rob
> ---
> drivers/of/address.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 8bfda6a..384574c 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -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);
> }
>
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-24 15:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-19 20:17 [PATCH] of/address: Don't loop forever in of_find_matching_node_by_address() David Daney
2015-08-24 15:17 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®