OSDN Git Service

ARM: EXYNOS: Handle of_find_device_by_node() and kstrdup() failures
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Fri, 27 Mar 2015 12:12:00 +0000 (13:12 +0100)
committerKukjin Kim <kgene@kernel.org>
Fri, 5 Jun 2015 17:17:55 +0000 (02:17 +0900)
Prevent possible NULL pointer dereference of pointer returned by
of_find_device_by_node(). Handle this by skipping such power domain.

Additionally fail the init on kstrdup() failure. Such case is actually
not fatal because the name for power domain allocated by kstrdup() is
used only in printk. Still as a precaution handle this as an error
condition.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
arch/arm/mach-exynos/pm_domains.c

index b15f866..3b54f6e 100644 (file)
@@ -126,6 +126,12 @@ static __init int exynos4_pm_init_power_domain(void)
                struct device *dev;
 
                pdev = of_find_device_by_node(np);
+               if (!pdev) {
+                       pr_err("%s: failed to find device for node %s\n",
+                                       __func__, np->name);
+                       of_node_put(np);
+                       continue;
+               }
                dev = &pdev->dev;
 
                pd = kzalloc(sizeof(*pd), GFP_KERNEL);
@@ -136,6 +142,12 @@ static __init int exynos4_pm_init_power_domain(void)
                }
 
                pd->pd.name = kstrdup(dev_name(dev), GFP_KERNEL);
+               if (!pd->pd.name) {
+                       kfree(pd);
+                       of_node_put(np);
+                       return -ENOMEM;
+               }
+
                pd->name = pd->pd.name;
                pd->base = of_iomap(np, 0);
                if (!pd->base) {