diff options
| author | Colin Ian King <colin.king@canonical.com> | 2019-08-16 23:21:51 +0100 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2019-08-19 19:06:14 +0200 |
| commit | 3636e82135ce5ade87c238e61a315df23dbcd4d6 (patch) | |
| tree | f39ab2413cb8ba8065533dc36b71345fbe17b717 /drivers/soc | |
| parent | 40d8aff614f71ab3cab20785b4f213e3802d4e87 (diff) | |
| download | linux-stable-3636e82135ce5ade87c238e61a315df23dbcd4d6.tar.gz linux-stable-3636e82135ce5ade87c238e61a315df23dbcd4d6.tar.bz2 linux-stable-3636e82135ce5ade87c238e61a315df23dbcd4d6.zip | |
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 <colin.king@canonical.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/samsung/exynos-chipid.c | 14 |
1 files changed, 10 insertions, 4 deletions
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); |