From: Michał Mirosław mirq-linux@rere.qmqm.pl
commit d3c731564e09b6c2ebefcd1344743a91a237d6dc upstream.
By calling device_initialize() earlier and noting that kfree(NULL) is ok, we can save a bit of code in error handling and plug of_node leak. Fixed commit already did part of the work.
Fixes: 9177514ce349 ("regulator: fix memory leak on error path of regulator_register()") Signed-off-by: Michał Mirosław mirq-linux@rere.qmqm.pl Reviewed-by: Vladimir Zapolskiy vz@mleia.com Acked-by: Vladimir Zapolskiy vz@mleia.com Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/f5035b1b4d40745e66bacd571bbbb5e4644d21a1.159719532... Signed-off-by: Mark Brown broonie@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- drivers/regulator/core.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
--- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5094,6 +5094,7 @@ regulator_register(const struct regulato ret = -ENOMEM; goto rinse; } + device_initialize(&rdev->dev);
/* * Duplicate the config so the driver could override it after @@ -5101,9 +5102,8 @@ regulator_register(const struct regulato */ config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL); if (config == NULL) { - kfree(rdev); ret = -ENOMEM; - goto rinse; + goto clean; }
init_data = regulator_of_get_init_data(dev, regulator_desc, config, @@ -5115,10 +5115,8 @@ regulator_register(const struct regulato * from a gpio extender or something else. */ if (PTR_ERR(init_data) == -EPROBE_DEFER) { - kfree(config); - kfree(rdev); ret = -EPROBE_DEFER; - goto rinse; + goto clean; }
/* @@ -5171,7 +5169,6 @@ regulator_register(const struct regulato }
/* register with sysfs */ - device_initialize(&rdev->dev); rdev->dev.class = ®ulator_class; rdev->dev.parent = dev; dev_set_name(&rdev->dev, "regulator.%lu", @@ -5249,13 +5246,11 @@ wash: mutex_lock(®ulator_list_mutex); regulator_ena_gpio_free(rdev); mutex_unlock(®ulator_list_mutex); - put_device(&rdev->dev); - rdev = NULL; clean: if (dangling_of_gpiod) gpiod_put(config->ena_gpiod); - kfree(rdev); kfree(config); + put_device(&rdev->dev); rinse: if (dangling_cfg_gpiod) gpiod_put(cfg->ena_gpiod);