[PATCH] regulator: cros-ec-regulator: Fix double free of desc->name.

[PATCH] regulator: cros-ec-regulator: Fix double free of desc->name.

[Pi-Hsun Shih]

The desc->name field is allocated with devm_kstrdup, but is also kfreed
on the error path, causing it to be double freed. Remove the kfree on
the error path.

Fixes: 8d9f8d57e023 ("regulator: Add driver for cros-ec-regulator")
Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
---
 drivers/regulator/cros-ec-regulator.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/regulator/cros-ec-regulator.c b/drivers/regulator/cros-ec-regulator.c
index 35f97246bc48..cee259eb0213 100644
--- a/drivers/regulator/cros-ec-regulator.c
+++ b/drivers/regulator/cros-ec-regulator.c
@@ -222,18 +222,13 @@ static int cros_ec_regulator_probe(struct platform_device *pdev)
 
 	drvdata->dev = devm_regulator_register(dev, &drvdata->desc, &cfg);
 	if (IS_ERR(drvdata->dev)) {
-		ret = PTR_ERR(drvdata->dev);
 		dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
-		goto free_name;
+		return PTR_ERR(drvdata->dev);
 	}
 
 	platform_set_drvdata(pdev, drvdata);
 
 	return 0;
-
-free_name:
-	kfree(desc->name);
-	return ret;
 }
 
 static const struct of_device_id regulator_cros_ec_of_match[] = {

base-commit: 8d9f8d57e023893bfa708d83e3a787e77766a378
-- 
2.28.0.rc0.142.g3c755180ce-goog

Re: [PATCH] regulator: cros-ec-regulator: Fix double free of desc->name.

[Enric Balletbo i Serra]

Hi Pi-Hsun,

Thank you for your patch and to send upstream.

On 28/7/20 11:19, Pi-Hsun Shih wrote:
> The desc->name field is allocated with devm_kstrdup, but is also kfreed
> on the error path, causing it to be double freed. Remove the kfree on
> the error path.
> 
> Fixes: 8d9f8d57e023 ("regulator: Add driver for cros-ec-regulator")
> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>

Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

> ---
>  drivers/regulator/cros-ec-regulator.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/regulator/cros-ec-regulator.c b/drivers/regulator/cros-ec-regulator.c
> index 35f97246bc48..cee259eb0213 100644
> --- a/drivers/regulator/cros-ec-regulator.c
> +++ b/drivers/regulator/cros-ec-regulator.c
> @@ -222,18 +222,13 @@ static int cros_ec_regulator_probe(struct platform_device *pdev)
>  
>  	drvdata->dev = devm_regulator_register(dev, &drvdata->desc, &cfg);
>  	if (IS_ERR(drvdata->dev)) {
> -		ret = PTR_ERR(drvdata->dev);
>  		dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
> -		goto free_name;
> +		return PTR_ERR(drvdata->dev);
>  	}
>  
>  	platform_set_drvdata(pdev, drvdata);
>  
>  	return 0;
> -
> -free_name:
> -	kfree(desc->name);
> -	return ret;
>  }
>  
>  static const struct of_device_id regulator_cros_ec_of_match[] = {
> 
> base-commit: 8d9f8d57e023893bfa708d83e3a787e77766a378
> 

Re: [PATCH] regulator: cros-ec-regulator: Fix double free of desc->name.

[Mark Brown]

On Tue, 28 Jul 2020 17:19:09 +0800, Pi-Hsun Shih wrote:
> The desc->name field is allocated with devm_kstrdup, but is also kfreed
> on the error path, causing it to be double freed. Remove the kfree on
> the error path.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: cros-ec-regulator: Fix double free of desc->name.
      commit: 176cf704425f3d22603d379ffa4a1033a24a779d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark