| From 488fb6effe03e20f38d34da7425de77bbd3e2665 Mon Sep 17 00:00:00 2001 |
| From: Kory Maincent <kory.maincent@bootlin.com> |
| Date: Wed, 12 Feb 2025 16:17:51 +0100 |
| Subject: net: pse-pd: Fix deadlock in current limit functions |
| |
| From: Kory Maincent <kory.maincent@bootlin.com> |
| |
| commit 488fb6effe03e20f38d34da7425de77bbd3e2665 upstream. |
| |
| 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: e0a5e2bba38a ("net: pse-pd: Use power limit at driver side instead of current limit") |
| Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> |
| Link: https://patch.msgid.link/20250212151751.1515008-1-kory.maincent@bootlin.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/pse-pd/pse_core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/pse-pd/pse_core.c |
| +++ b/drivers/net/pse-pd/pse_core.c |
| @@ -309,7 +309,7 @@ static int pse_pi_get_current_limit(stru |
| 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; |
| @@ -346,7 +346,7 @@ static int pse_pi_set_current_limit(stru |
| |
| 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; |
