| From 3a496b00b6f90c41bd21a410871dfc97d4f3c7ab Mon Sep 17 00:00:00 2001 |
| From: David Daney <david.daney@cavium.com> |
| Date: Wed, 19 Aug 2015 13:17:47 -0700 |
| Subject: of/address: Don't loop forever in of_find_matching_node_by_address(). |
| |
| From: David Daney <david.daney@cavium.com> |
| |
| 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> |
| |
| --- |
| drivers/of/address.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/of/address.c |
| +++ b/drivers/of/address.c |
| @@ -704,10 +704,10 @@ struct device_node *of_find_matching_nod |
| 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); |
| } |
| |
