pmdomain: samsung: plug potential memleak during probe

[ Upstream commit 90c82941adf1986364e0f82c35cf59f2bf5f6a1d ]

of_genpd_add_provider_simple() could fail, in which case this code
leaks the domain name, pd->pd.name.

Use devm_kstrdup_const() to plug this leak. As a side-effect, we can
simplify existing error handling.

Fixes: c09a3e6c97f0 ("soc: samsung: pm_domains: Convert to regular platform driver")
Cc: stable@vger.kernel.org
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
[ drivers/pmdomain/samsung/exynos-pm-domains.c -> drivers/soc/samsung/pm_domains.c ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/soc/samsung/pm_domains.c
index d07f3c9d69031b313e333172c90083f082d2217b..1091e4a0ed9d95ba8fbaa1984194c2599fe5f50c 100644 (file)
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@ -91,13 +91,14 @@ static const struct of_device_id exynos_pm_domain_of_match[] = {
        { },
 };
 
-static const char *exynos_get_domain_name(struct device_node *node)
+static const char *exynos_get_domain_name(struct device *dev,
+                                         struct device_node *node)
 {
        const char *name;
 
        if (of_property_read_string(node, "label", &name) < 0)
                name = kbasename(node->full_name);
-       return kstrdup_const(name, GFP_KERNEL);
+       return devm_kstrdup_const(dev, name, GFP_KERNEL);
 }
 
 static int exynos_pd_probe(struct platform_device *pdev)
@@ -114,15 +115,13 @@ static int exynos_pd_probe(struct platform_device *pdev)
        if (!pd)
                return -ENOMEM;
 
-       pd->pd.name = exynos_get_domain_name(np);
+       pd->pd.name = exynos_get_domain_name(dev, np);
        if (!pd->pd.name)
                return -ENOMEM;
 
        pd->base = of_iomap(np, 0);
-       if (!pd->base) {
-               kfree_const(pd->pd.name);
+       if (!pd->base)
                return -ENODEV;
-       }
 
        pd->pd.power_off = exynos_pd_power_off;
        pd->pd.power_on = exynos_pd_power_on;