From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Date: Fri, 21 Mar 2014 12:18:17 +0000 (+0100)
Subject: clk: s2mps11: Fix possible NULL pointer dereference
X-Git-Tag: v3.12.20~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb41a94f97f00a895dbc1130d064954b54718373;p=thirdparty%2Fkernel%2Fstable.git

clk: s2mps11: Fix possible NULL pointer dereference

commit 238e14055da87d0d012257788e39fe0df3a82226 upstream.

If parent device does not have of_node set the s2mps11_clk_parse_dt()
returned NULL. This NULL was later passed to of_clk_add_provider() which
dereferenced it in pr_debug() call.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---

diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
index 7be41e676a647..aa21299ec7d26 100644
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -130,7 +130,7 @@ static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev)
 	int i;
 
 	if (!iodev->dev->of_node)
-		return NULL;
+		return ERR_PTR(-EINVAL);
 
 	clk_np = of_find_node_by_name(iodev->dev->of_node, "clocks");
 	if (!clk_np) {