Skip to content

Commit

Permalink
regulator/core: regulator_register: set device->class earlier
Browse files Browse the repository at this point in the history
[ Upstream commit 8adb4e6 ]

When fixing a memory leak in commit d3c7315 ("regulator: plug
of_node leak in regulator_register()'s error path") it moved the
device_initialize() call earlier, but did not move the `dev->class`
initialization.  The bug was spotted and fixed by reverting part of
the commit (in commit 5f4b204 "regulator: core: fix kobject
release warning and memory leak in regulator_register()") but
introducing a different bug: now early error paths use `kfree(dev)`
instead of `put_device()` for an already initialized `struct device`.

Move the missing assignments to just after `device_initialize()`.

Fixes: d3c7315 ("regulator: plug of_node leak in regulator_register()'s error path")
Signed-off-by: Michał Mirosław <[email protected]>
Link: https://lore.kernel.org/r/b5b19cb458c40c9d02f3d5a7bd1ba7d97ba17279.1695077303.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
osctobe authored and gregkh committed Oct 10, 2023
1 parent fbac416 commit 937ec44
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5543,6 +5543,8 @@ regulator_register(struct device *dev,
goto rinse;
}
device_initialize(&rdev->dev);
dev_set_drvdata(&rdev->dev, rdev);
rdev->dev.class = &regulator_class;
spin_lock_init(&rdev->err_lock);

/*
Expand Down Expand Up @@ -5604,11 +5606,9 @@ regulator_register(struct device *dev,
rdev->supply_name = regulator_desc->supply_name;

/* register with sysfs */
rdev->dev.class = &regulator_class;
rdev->dev.parent = config->dev;
dev_set_name(&rdev->dev, "regulator.%lu",
(unsigned long) atomic_inc_return(&regulator_no));
dev_set_drvdata(&rdev->dev, rdev);

/* set regulator constraints */
if (init_data)
Expand Down

0 comments on commit 937ec44

Please sign in to comment.