diff options
| author |   Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2020-11-13 01:20:28 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-11-13 14:21:25 +0000 |
| commit | 4b639e254d3d4f15ee4ff2b890a447204cfbeea9 (patch) | |
| tree | d87da44786be57215e6308d049e63e4589f7969c /drivers/regulator/core.c | |
| parent | regulator: fix memory leak with repeated set_machine_constraints() (diff) | |
| download | linux-dev-4b639e254d3d4f15ee4ff2b890a447204cfbeea9.tar.xz linux-dev-4b639e254d3d4f15ee4ff2b890a447204cfbeea9.zip | |
regulator: avoid resolve_supply() infinite recursion
When a regulator's name equals its supply's name the
regulator_resolve_supply() recurses indefinitely. Add a check
so that debugging the problem is easier. The "fixed" commit
just exposed the problem.
Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator")
Cc: stable@vger.kernel.org
Reported-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Tested-by: Ahmad Fatoum <a.fatoum@pengutronix.de> # stpmic1
Link: https://lore.kernel.org/r/c6171057cfc0896f950c4d8cb82df0f9f1b89ad9.1605226675.git.mirq-linux@rere.qmqm.pl
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 84dd0aea97c5..d3b96efa20fd 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1841,6 +1841,12 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } } + if (r == rdev) { + dev_err(dev, "Supply for %s (%s) resolved to itself\n", + rdev->desc->name, rdev->supply_name); + return -EINVAL; + } + /* * If the supply's parent device is not the same as the * regulator's parent device, then ensure the parent device |