Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Sebastian Reichel
a9f6a19b 9f6cd98f

+3 -3
+2 -2
drivers/power/power_supply_leds.c
··· 25 25 unsigned long delay_on = 0; 26 26 unsigned long delay_off = 0; 27 27 28 - if (psy->desc->get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) 28 + if (power_supply_get_property(psy, POWER_SUPPLY_PROP_STATUS, &status)) 29 29 return; 30 30 31 31 dev_dbg(&psy->dev, "%s %d\n", __func__, status.intval); ··· 115 115 { 116 116 union power_supply_propval online; 117 117 118 - if (psy->desc->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online)) 118 + if (power_supply_get_property(psy, POWER_SUPPLY_PROP_ONLINE, &online)) 119 119 return; 120 120 121 121 dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval);
+1 -1
drivers/power/power_supply_sysfs.c
··· 125 125 126 126 value.intval = long_val; 127 127 128 - ret = psy->desc->set_property(psy, off, &value); 128 + ret = power_supply_set_property(psy, off, &value); 129 129 if (ret < 0) 130 130 return ret; 131 131