Skip to contentSkip to conversation

hwmon: (pmbus_core) Fix Deadlock in pmbus_regulator_get_status

PATCH New Guenter Roeck 1 participant 1 message Jul 27, 2023 Hardware monitoring

lore
Share & tools
lore

Guenter Roeck

author maintainer
#0 lore raw

PATCH 1/1 hwmon: (pmbus_core) Fix Deadlock in pmbus_regulator_get_status

pmbus_regulator_get_status() acquires update_lock. pmbus_regulator_get_error_flags() acquires it again, resulting in an immediate deadlock.

Call _pmbus_get_flags() from pmbus_regulator_get_status() directly to avoid the problem.

Cc Naresh Solanki <[email protected]>
Fixes c05f477c4ba3 ("hwmon: (pmbus/core) Implement regulator get_status")

---
I want to send this in a pull request this week, and I have not heard back from the reporters. Patrick, Naresh, please feel free to submit a similar patch by Thursday EOB this week. Otherwise I'll send this one upstream.

 drivers/hwmon/pmbus/pmbus_core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus_core.c +2 -1
index 30aeb59062a5..69a4e62b6c8d 100644
@@ -2946,6 +2946,7 @@ static int pmbus_regulator_get_status(struct regulator_dev *rdev)
 	struct pmbus_data *data = i2c_get_clientdata(client);
 	u8 page = rdev_get_id(rdev);
 	int status, ret;
+	int event;
 
 	mutex_lock(&data->update_lock);
 	status = pmbus_get_status(client, page, PMBUS_STATUS_WORD);
@@ -2965,7 +2966,7 @@ static int pmbus_regulator_get_status(struct regulator_dev *rdev)
 		goto unlock;
 	}
 
-	ret = pmbus_regulator_get_error_flags(rdev, &status);
+	ret = _pmbus_get_flags(data, rdev_get_id(rdev), &status, &event, false);
 	if (ret)
 		goto unlock;
 
Signature · 1 line
2.39.2