leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: plug of_node leak in regulator_register()'s error path

Browse Source 
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: 9177514ce3 ("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.1597195321.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Michał Mirosław 2020-08-12 03:31:36 +02:00 committed by Mark Brown
parent 5c06540165
commit d3c731564e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/regulator/core.c
View File

@ -5167,6 +5167,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
ret = -ENOMEM; ret = -ENOMEM;
goto rinse; goto rinse;
} }
device_initialize(&rdev->dev);
/* /*
* Duplicate the config so the driver could override it after * Duplicate the config so the driver could override it after
@ -5174,9 +5175,8 @@ regulator_register(const struct regulator_desc *regulator_desc,
*/ */
config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL); config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL);
if (config == NULL) { if (config == NULL) {
kfree(rdev);
ret = -ENOMEM; ret = -ENOMEM;
goto rinse; goto clean;
} }
init_data = regulator_of_get_init_data(dev, regulator_desc, config, init_data = regulator_of_get_init_data(dev, regulator_desc, config,
@ -5188,10 +5188,8 @@ regulator_register(const struct regulator_desc *regulator_desc,
* from a gpio extender or something else. * from a gpio extender or something else.
*/ */
if (PTR_ERR(init_data) == -EPROBE_DEFER) { if (PTR_ERR(init_data) == -EPROBE_DEFER) {
kfree(config);
kfree(rdev);
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto rinse; goto clean;
} }
/* /*
@ -5244,7 +5242,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
} }
/* register with sysfs */ /* register with sysfs */
device_initialize(&rdev->dev);
rdev->dev.class = &regulator_class; rdev->dev.class = &regulator_class;
rdev->dev.parent = dev; rdev->dev.parent = dev;
dev_set_name(&rdev->dev, "regulator.%lu", dev_set_name(&rdev->dev, "regulator.%lu",
@ -5322,13 +5319,11 @@ wash:
mutex_lock(&regulator_list_mutex); mutex_lock(&regulator_list_mutex);
regulator_ena_gpio_free(rdev); regulator_ena_gpio_free(rdev);
mutex_unlock(&regulator_list_mutex); mutex_unlock(&regulator_list_mutex);
put_device(&rdev->dev);
rdev = NULL;
clean: clean:
if (dangling_of_gpiod) if (dangling_of_gpiod)
gpiod_put(config->ena_gpiod); gpiod_put(config->ena_gpiod);
kfree(rdev);
kfree(config); kfree(config);
put_device(&rdev->dev);
rinse: rinse:
if (dangling_cfg_gpiod) if (dangling_cfg_gpiod)
gpiod_put(cfg->ena_gpiod); gpiod_put(cfg->ena_gpiod);