[PATCH 3.12 29/84] of/address: Don't loop forever in of_find_matching_node_by_address().

[Jiri Slaby]

From: David Daney 

3.12-stable review patch.  If anyone has any objections, please let me know.

===

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 
Signed-off-by: Rob Herring 
Signed-off-by: Jiri Slaby 
---
 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 f5582f3a06a4..3a308877ac90 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -696,10 +696,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, ))
-   continue;
-   if (res.start == base_address)
+   if (!of_address_to_resource(dn, 0, ) &&
+   res.start == base_address)
return dn;
+
dn = of_find_matching_node(dn, matches);
}
 
-- 
2.6.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3.12 29/84] of/address: Don't loop forever in of_find_matching_node_by_address().

[Jiri Slaby]

From: David Daney 

3.12-stable review patch.  If anyone has any objections, please let me know.

===

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 
Signed-off-by: Rob Herring 
Signed-off-by: Jiri Slaby 
---
 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 f5582f3a06a4..3a308877ac90 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -696,10 +696,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, ))
-   continue;
-   if (res.start == base_address)
+   if (!of_address_to_resource(dn, 0, ) &&
+   res.start == base_address)
return dn;
+
dn = of_find_matching_node(dn, matches);
}
 
-- 
2.6.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/