From 3636e82135ce5ade87c238e61a315df23dbcd4d6 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Fri, 16 Aug 2019 23:21:51 +0100 Subject: soc: samsung: chipid: Fix memory leak in error path Currently when the call to product_id_to_soc_id fails there is a memory leak of soc_dev_attr->revision and soc_dev_attr on the error return path. Fix this by adding a common error return path that frees there obects and use this for two error return paths. Addresses-Coverity: ("Resource leak") Fixes: 3253b7b7cd44 ("soc: samsung: Add exynos chipid driver support") Signed-off-by: Colin Ian King Signed-off-by: Krzysztof Kozlowski --- drivers/soc/samsung/exynos-chipid.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'drivers/soc') diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 006a95feb618..75b6b880d9ef 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -81,15 +81,15 @@ int __init exynos_chipid_early_init(void) soc_dev_attr->soc_id = product_id_to_soc_id(product_id); if (!soc_dev_attr->soc_id) { pr_err("Unknown SoC\n"); - return -ENODEV; + ret = -ENODEV; + goto err; } /* please note that the actual registration will be deferred */ soc_dev = soc_device_register(soc_dev_attr); if (IS_ERR(soc_dev)) { - kfree(soc_dev_attr->revision); - kfree(soc_dev_attr); - return PTR_ERR(soc_dev); + ret = PTR_ERR(soc_dev); + goto err; } /* it is too early to use dev_info() here (soc_dev is NULL) */ @@ -97,5 +97,11 @@ int __init exynos_chipid_early_init(void) soc_dev_attr->soc_id, product_id, revision); return 0; + +err: + kfree(soc_dev_attr->revision); + kfree(soc_dev_attr); + return ret; } + early_initcall(exynos_chipid_early_init); -- cgit v1.2.3 From 823034575c177d1d69673102a994d5d33b05e3de Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 21 Aug 2019 17:05:39 +0200 Subject: soc: samsung: chipid: Remove the regmap lookup error log In commit 40d8aff614f7 ("soc: samsung: chipid: Convert exynos-chipid driver to use the regmap API") of_find_compatible_node() call was substituted with syscon_regmap_lookup_by_compatible() but also an error log was added for case where lookup fails. On multiplatform the lookup will always fail on any non-samsung device so the log is incorrect. Remove the error log and just return an error code from syscon_regmap_lookup_by_compatible() which internally calls of_find_compatible_node(). Reported-by: Jon Hunter Signed-off-by: Sylwester Nawrocki Signed-off-by: Krzysztof Kozlowski --- drivers/soc/samsung/exynos-chipid.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/soc') diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 75b6b880d9ef..c55a47cfe617 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -56,10 +56,8 @@ int __init exynos_chipid_early_init(void) int ret; regmap = syscon_regmap_lookup_by_compatible("samsung,exynos4210-chipid"); - if (IS_ERR(regmap)) { - pr_err("Failed to get CHIPID regmap\n"); + if (IS_ERR(regmap)) return PTR_ERR(regmap); - } ret = regmap_read(regmap, EXYNOS_CHIPID_REG_PRO_ID, &product_id); if (ret < 0) -- cgit v1.2.3 From 28578825ede61834a2c46e7f9a89012c4c7a667f Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Wed, 21 Aug 2019 17:39:26 +0200 Subject: soc: samsung: chipid: Select missing dependency for EXYNOS_CHIPID The chipid driver uses the MFD syscon API but it was not covered properly in Kconfig. Signed-off-by: Sylwester Nawrocki Signed-off-by: Krzysztof Kozlowski --- drivers/soc/samsung/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/soc') diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 2905f5262197..33ad0de2de3c 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -10,6 +10,7 @@ if SOC_SAMSUNG config EXYNOS_CHIPID bool "Exynos Chipid controller driver" if COMPILE_TEST depends on ARCH_EXYNOS || COMPILE_TEST + select MFD_SYSCON select SOC_BUS config EXYNOS_PMU -- cgit v1.2.3