[PATCH] power: supply: hold extensions_sem when creating LED triggers

[PATCH] power: supply: hold extensions_sem when creating LED triggers

[Steffen Dirkwinkel]

From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

LED triggers were created in __power_supply_register without holding the
extensions_sem lock. Since commit b04510c3af6d ("power: supply: leds: create
triggers based on properties, not type") we call power_supply_has_property
during trigger creation and access the extensions there.
Move power_supply_create_triggers down into the lock scope used for
power_supply_add_hwmon_sysfs for the same reason.

Fixes: b04510c3af6d ("power: supply: leds: create triggers based on properties, not type")
Reported-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Closes: https://lore.kernel.org/all/a95a2720-4092-4b49-bd9d-b700f1c2680d@intel.com/
Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
---
 drivers/power/supply/power_supply_core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 2532e221b2e1..cbf6ebef7850 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1636,11 +1636,11 @@ __power_supply_register(struct device *parent,
 	if (rc)
 		goto register_thermal_failed;
 
-	rc = power_supply_create_triggers(psy);
-	if (rc)
-		goto create_triggers_failed;
-
 	scoped_guard(rwsem_read, &psy->extensions_sem) {
+		rc = power_supply_create_triggers(psy);
+		if (rc)
+			goto create_triggers_failed;
+
 		rc = power_supply_add_hwmon_sysfs(psy);
 		if (rc)
 			goto add_hwmon_sysfs_failed;

---
base-commit: 657cd3a42e937276262c0a8ae6b01a87004309de
change-id: 20260724-power-supply-triggers-lockdep-2083247dcecd

Best regards,
--  
Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>

Re: [PATCH] power: supply: hold extensions_sem when creating LED triggers

[Borah, Chaitanya Kumar]

On 7/24/2026 12:57 PM, Steffen Dirkwinkel wrote:
> From: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
> 
> LED triggers were created in __power_supply_register without holding the
> extensions_sem lock. Since commit b04510c3af6d ("power: supply: leds: create
> triggers based on properties, not type") we call power_supply_has_property
> during trigger creation and access the extensions there.
> Move power_supply_create_triggers down into the lock scope used for
> power_supply_add_hwmon_sysfs for the same reason.
> 

Tested-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>

> Fixes: b04510c3af6d ("power: supply: leds: create triggers based on properties, not type")
> Reported-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> Closes: https://lore.kernel.org/all/a95a2720-4092-4b49-bd9d-b700f1c2680d@intel.com/
> Signed-off-by: Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
> ---
>   drivers/power/supply/power_supply_core.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 2532e221b2e1..cbf6ebef7850 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -1636,11 +1636,11 @@ __power_supply_register(struct device *parent,
>   	if (rc)
>   		goto register_thermal_failed;
>   
> -	rc = power_supply_create_triggers(psy);
> -	if (rc)
> -		goto create_triggers_failed;
> -
>   	scoped_guard(rwsem_read, &psy->extensions_sem) {
> +		rc = power_supply_create_triggers(psy);
> +		if (rc)
> +			goto create_triggers_failed;
> +
>   		rc = power_supply_add_hwmon_sysfs(psy);
>   		if (rc)
>   			goto add_hwmon_sysfs_failed;
> 
> ---
> base-commit: 657cd3a42e937276262c0a8ae6b01a87004309de
> change-id: 20260724-power-supply-triggers-lockdep-2083247dcecd
> 
> Best regards,
> --
> Steffen Dirkwinkel <s.dirkwinkel@beckhoff.com>
>