openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: David Daney <david.daney@cavium.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
David Daney 2015-08-19 13:17:47 -07:00 committed by Rob Herring
parent 068627a597
commit 3a496b00b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/of/address.c
View File

@ -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);
} }