Skip to content

Commit

Permalink
regulator: avoid resolve_supply() infinite recursion
Browse files Browse the repository at this point in the history
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: aea6cb9 ("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>
  • Loading branch information
osctobe authored and broonie committed Nov 13, 2020
1 parent 57a6ad4 commit 4b639e2
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4b639e2

Please sign in to comment.