Skip to content

Commit 9177514

Browse files
vzapolskiybroonie
authored andcommitted
regulator: fix memory leak on error path of regulator_register()
The change corrects registration and deregistration on error path of a regulator, the problem was manifested by a reported memory leak on deferred probe: as3722-regulator as3722-regulator: regulator 13 register failed -517 # cat /sys/kernel/debug/kmemleak unreferenced object 0xecc43740 (size 64): comm "swapper/0", pid 1, jiffies 4294937640 (age 712.880s) hex dump (first 32 bytes): 72 65 67 75 6c 61 74 6f 72 2e 32 34 00 5a 5a 5a regulator.24.ZZZ 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ backtrace: [<0c4c3d1c>] __kmalloc_track_caller+0x15c/0x2c0 [<40c0ad48>] kvasprintf+0x64/0xd4 [<109abd29>] kvasprintf_const+0x70/0x84 [<c4215946>] kobject_set_name_vargs+0x34/0xa8 [<62282ea2>] dev_set_name+0x40/0x64 [<a39b6757>] regulator_register+0x3a4/0x1344 [<16a9543f>] devm_regulator_register+0x4c/0x84 [<51a4c6a1>] as3722_regulator_probe+0x294/0x754 ... The memory leak problem was introduced as a side ef another fix in regulator_register() error path, I believe that the proper fix is to decouple device_register() function into its two compounds and initialize a struct device before assigning any values to its fields and then using it before actual registration of a device happens. This lets to call put_device() safely after initialization, and, since now a release callback is called, kfree(rdev->constraints) shall be removed to exclude a double free condition. Fixes: a3cde95 ("regulator: core: fix regulator_register() error paths to properly release rdev") Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Cc: Wen Yang <wenyang@linux.alibaba.com> Link: https://lore.kernel.org/r/20200724005013.23278-1-vz@mleia.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 2ca76b3 commit 9177514

1 file changed

Lines changed: 7 additions & 11 deletions

File tree

drivers/regulator/core.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5092,7 +5092,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
50925092
struct regulator_dev *rdev;
50935093
bool dangling_cfg_gpiod = false;
50945094
bool dangling_of_gpiod = false;
5095-
bool reg_device_fail = false;
50965095
struct device *dev;
50975096
int ret, i;
50985097

@@ -5221,10 +5220,12 @@ regulator_register(const struct regulator_desc *regulator_desc,
52215220
}
52225221

52235222
/* register with sysfs */
5223+
device_initialize(&rdev->dev);
52245224
rdev->dev.class = &regulator_class;
52255225
rdev->dev.parent = dev;
52265226
dev_set_name(&rdev->dev, "regulator.%lu",
52275227
(unsigned long) atomic_inc_return(&regulator_no));
5228+
dev_set_drvdata(&rdev->dev, rdev);
52285229

52295230
/* set regulator constraints */
52305231
if (init_data)
@@ -5275,12 +5276,9 @@ regulator_register(const struct regulator_desc *regulator_desc,
52755276
!rdev->desc->fixed_uV)
52765277
rdev->is_switch = true;
52775278

5278-
dev_set_drvdata(&rdev->dev, rdev);
5279-
ret = device_register(&rdev->dev);
5280-
if (ret != 0) {
5281-
reg_device_fail = true;
5279+
ret = device_add(&rdev->dev);
5280+
if (ret != 0)
52825281
goto unset_supplies;
5283-
}
52845282

52855283
rdev_init_debugfs(rdev);
52865284

@@ -5302,17 +5300,15 @@ regulator_register(const struct regulator_desc *regulator_desc,
53025300
mutex_unlock(&regulator_list_mutex);
53035301
wash:
53045302
kfree(rdev->coupling_desc.coupled_rdevs);
5305-
kfree(rdev->constraints);
53065303
mutex_lock(&regulator_list_mutex);
53075304
regulator_ena_gpio_free(rdev);
53085305
mutex_unlock(&regulator_list_mutex);
5306+
put_device(&rdev->dev);
5307+
rdev = NULL;
53095308
clean:
53105309
if (dangling_of_gpiod)
53115310
gpiod_put(config->ena_gpiod);
5312-
if (reg_device_fail)
5313-
put_device(&rdev->dev);
5314-
else
5315-
kfree(rdev);
5311+
kfree(rdev);
53165312
kfree(config);
53175313
rinse:
53185314
if (dangling_cfg_gpiod)

0 commit comments

Comments
 (0)