Skip to content

Commit

Permalink
regulator: cros-ec-regulator: Fix double free of desc->name.
Browse files Browse the repository at this point in the history
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: 8d9f8d5 ("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>
Link: https://lore.kernel.org/r/20200728091909.2009771-1-pihsun@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Pi-Hsun Shih authored and Mark Brown committed Jul 28, 2020
1 parent a233547 commit 176cf70
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/regulator/cros-ec-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down

0 comments on commit 176cf70

Please sign in to comment.