Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00aa5e8d authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

regulator: avoid resolve_supply() infinite recursion 



commit 4b639e254d3d4f15ee4ff2b890a447204cfbeea9 upstream.

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: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: default avatarMichał 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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 675b9c12

drivers/regulator/core.c

+6 −0
Original line number Diff line number Diff line
@@ -1595,6 +1595,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