Skip to content

Commit a9f6a19

Browse files
krzksre
authored andcommitted
power_supply: Use wrappers to avoid races when registering power supply
Use wrappers over get_property() and set_property() internally in power supply and for sysfs interface. The wrappers provide safe access if power supply is not yet registered or t is being destroyed. In case of syfs the theoretical race could happen between ending of driver's probe and parallel sysfs access: some_driver_probe() userspace ==================================== =========================== drv->psy = power_supply_register() device_add() sysfs entries are created atomic_inc(&psy->use_cnt); store on sysfs attributes drv->set_property() dereference of drv->psy drv->psy = returned psy; For leds the race could happen between power supply being destroyed and ongoing power_supply_changed_work(). Signed-off-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Sebastian Reichel <[email protected]>
1 parent 9f6cd98 commit a9f6a19

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/power/power_supply_leds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
2525
unsigned long delay_on = 0;
2626
unsigned long delay_off = 0;
2727

28-
if (psy->desc->get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))
28+
if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status))
2929
return;
3030

3131
dev_dbg(&psy->dev, "%s %d\n", __func__, status.intval);
@@ -115,7 +115,7 @@ static void power_supply_update_gen_leds(struct power_supply *psy)
115115
{
116116
union power_supply_propval online;
117117

118-
if (psy->desc->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online))
118+
if (power_supply_get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online))
119119
return;
120120

121121
dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval);

drivers/power/power_supply_sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static ssize_t power_supply_store_property(struct device *dev,
125125

126126
value.intval = long_val;
127127

128-
ret = psy->desc->set_property(psy, off, &value);
128+
ret = power_supply_set_property(psy, off, &value);
129129
if (ret < 0)
130130
return ret;
131131

0 commit comments

Comments
 (0)