Commit 488fb6ef authored by Kory Maincent's avatar Kory Maincent Committed by Jakub Kicinski
Browse files

net: pse-pd: Fix deadlock in current limit functions 



Fix a deadlock in pse_pi_get_current_limit and pse_pi_set_current_limit
caused by consecutive mutex_lock calls. One in the function itself and
another in pse_pi_get_voltage.

Resolve the issue by using the unlocked version of pse_pi_get_voltage
instead.

Fixes: e0a5e2bb ("net: pse-pd: Use power limit at driver side instead of current limit")
Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Link: https://patch.msgid.link/20250212151751.1515008-1-kory.maincent@bootlin.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 540cda75

drivers/net/pse-pd/pse_core.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int pse_pi_get_current_limit(struct regulator_dev *rdev) 
		goto out;

	mW = ret;



	ret = pse_pi_get_voltage(rdev);

	ret = _pse_pi_get_voltage(rdev);

	if (!ret) {

		dev_err(pcdev->dev, "Voltage null\n");

		ret = -ERANGE;
@@ -356,7 +356,7 @@ static int pse_pi_set_current_limit(struct regulator_dev *rdev, int min_uA, 


	id = rdev_get_id(rdev);

	mutex_lock(&pcdev->lock);

	ret = pse_pi_get_voltage(rdev);

	ret = _pse_pi_get_voltage(rdev);

	if (!ret) {

		dev_err(pcdev->dev, "Voltage null\n");

		ret = -ERANGE;