Skip to content

Commit 4d5c129

Browse files
jwrdegoedesre
authored andcommitted
power: supply: sc27xx: Fix external_power_changed race
sc27xx_fgu_external_power_changed() dereferences data->battery, which gets sets in ab8500_btemp_probe() like this: data->battery = devm_power_supply_register(dev, &sc27xx_fgu_desc, &fgu_cfg); As soon as devm_power_supply_register() has called device_add() the external_power_changed callback can get called. So there is a window where sc27xx_fgu_external_power_changed() may get called while data->battery has not been set yet leading to a NULL pointer dereference. Fixing this is easy. The external_power_changed callback gets passed the power_supply which will eventually get stored in data->battery, so sc27xx_fgu_external_power_changed() can simply directly use the passed in psy argument which is always valid. After this change sc27xx_fgu_external_power_changed() is reduced to just "power_supply_changed(psy);" and it has the same prototype. While at it simply replace it with making the external_power_changed callback directly point to power_supply_changed. Cc: Orson Zhai <orsonzhai@gmail.com> Cc: Chunyan Zhang <zhang.lyra@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 029a443 commit 4d5c129

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

drivers/power/supply/sc27xx_fuel_gauge.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -733,13 +733,6 @@ static int sc27xx_fgu_set_property(struct power_supply *psy,
733733
return ret;
734734
}
735735

736-
static void sc27xx_fgu_external_power_changed(struct power_supply *psy)
737-
{
738-
struct sc27xx_fgu_data *data = power_supply_get_drvdata(psy);
739-
740-
power_supply_changed(data->battery);
741-
}
742-
743736
static int sc27xx_fgu_property_is_writeable(struct power_supply *psy,
744737
enum power_supply_property psp)
745738
{
@@ -774,7 +767,7 @@ static const struct power_supply_desc sc27xx_fgu_desc = {
774767
.num_properties = ARRAY_SIZE(sc27xx_fgu_props),
775768
.get_property = sc27xx_fgu_get_property,
776769
.set_property = sc27xx_fgu_set_property,
777-
.external_power_changed = sc27xx_fgu_external_power_changed,
770+
.external_power_changed = power_supply_changed,
778771
.property_is_writeable = sc27xx_fgu_property_is_writeable,
779772
.no_thermal = true,
780773
};

0 commit comments

Comments
 (0)