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

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	David Daney <ddaney.cavm@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH] of/address: Don't loop forever in of_find_matching_node_by_address().
Date	Wed, 19 Aug 2015 22:20:01 +0200
Message-ID	<pZi01-808-3@gated-at.bofh.it> (permalink)
X-Original-To	linux-kernel@vger.kernel.org, Grant Likely <grant.likely@linaro.org>, Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=FC5u5Au9aX9HOVSCFMRl3v+s+bH/6in3V7dX7HDrLXA=; b=EMp4k/EdYZmF49C3P1V5LJGXKY42jn/k1VY4w8sXWGY+oTmLZRsEIcjsnK9wK3EcSN FFcgv3667WnaL4UXUSTUNeUWBeunFmcnDju4D7buns6hnahq3IXWbrEbFOznKyZgbqnW vDlIMBjiZ1OfBYZ4Xunf6g2b9tbIW0p+wT5/bou0rOwlj58C2y08AkSdO0cTAHkOeTTT 0b0HuGxCHqoVl4Tr00k0XrC5JKRvR4/F+h3A5S7BdgoWZACzwCJkJ/uL6XXYFyp3I2zV AFALBpFe9pQuTg1DwExiXHRRbPIaqCRXTNh9agmhFecBi0qSGL554BFY7RJ8zhBON5BM ZXIA==
X-Received	by 10.107.8.142 with SMTP id h14mr14809539ioi.35.1440015473116; Wed, 19 Aug 2015 13:17:53 -0700 (PDT)
X-Mailer	git-send-email 1.7.11.7
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	Robert Richter <rrichter@cavium.com>, David Daney <david.daney@cavium.com>
X-Original-Date	Wed, 19 Aug 2015 13:17:47 -0700
X-Original-Message-ID	<1440015467-21364-1-git-send-email-ddaney.cavm@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1210011

Show key headers only | View raw

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

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] of/address: Don't loop forever in of_find_matching_node_by_address(). David Daney <ddaney.cavm@gmail.com> - 2015-08-19 22:20 +0200
  Re: [PATCH] of/address: Don't loop forever in of_find_matching_node_by_address(). Rob Herring <robherring2@gmail.com> - 2015-08-24 17:20 +0200

csiph-web