diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-05-19 03:16:29 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-05-23 14:06:19 -0400 |
commit | a9f6a19b57c4f37dfd6aa322071948245fecbd91 (patch) | |
tree | 8a9534550a92c9a0de9da18026d447bcc8e6eb06 | |
parent | 9f6cd98fc3c64ebcebf63c04f16246f79bcc4c70 (diff) |
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>
-rw-r--r-- | drivers/power/power_supply_leds.c | 4 | ||||
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/power_supply_leds.c b/drivers/power/power_supply_leds.c index 2d41a43fc81a..2277ad9c2f68 100644 --- a/drivers/power/power_supply_leds.c +++ b/drivers/power/power_supply_leds.c | |||
@@ -25,7 +25,7 @@ static void power_supply_update_bat_leds(struct power_supply *psy) | |||
25 | unsigned long delay_on = 0; | 25 | unsigned long delay_on = 0; |
26 | unsigned long delay_off = 0; | 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 | return; | 29 | return; |
30 | 30 | ||
31 | dev_dbg(&psy->dev, "%s %d\n", __func__, status.intval); | 31 | 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) | |||
115 | { | 115 | { |
116 | union power_supply_propval online; | 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 | return; | 119 | return; |
120 | 120 | ||
121 | dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval); | 121 | dev_dbg(&psy->dev, "%s %d\n", __func__, online.intval); |
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 9134e3d2d95e..af026806cba5 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
@@ -125,7 +125,7 @@ static ssize_t power_supply_store_property(struct device *dev, | |||
125 | 125 | ||
126 | value.intval = long_val; | 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 | if (ret < 0) | 129 | if (ret < 0) |
130 | return ret; | 130 | return ret; |
131 | 131 | ||