Skip to content

power: supply: Fix external_power_changed race in several drivers

Hans de Goede linux-pm stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6power: supply: ab8500: Fix external_power_changed racedrivers/power/supply/ab8500_btemp.c drivers/power/supply/ab8500_fg.c+4 -81 reply
2/6power: supply: axp288_fuel_gauge: Fix external_power_changed racedrivers/power/supply/axp288_fuel_gauge.c+1 -10 replies
3/6power: supply: bq25890: Fix external_power_changed racedrivers/power/supply/bq25890_charger.c+1 -10 replies
4/6power: supply: sc27xx: Fix external_power_changed racedrivers/power/supply/sc27xx_fuel_gauge.c+1 -81 reply
5/6power: supply: max17042_battery: Refactor max17042_external_power_changed()drivers/power/supply/max17042_battery.c+1 -61 reply
6/6power: supply: twl4030_madc_battery: Refactor twl4030_madc_bat_ext_changed()drivers/power/supply/twl4030_madc_battery.c+1 -70 replies

Reviews trailers per patch

3 of 6 patches have a Reviewed-by or Acked-by.

PatchKrzysztof KozlowskiBaolin WangLinus Walleij
1/6R-b
2/6
3/6
4/6R-b
5/6R-b
6/6

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 0/6] power: supply: Fix external_power_changed race in several drivers

Hi All,

I hit this issue where a Lenovo Yoga Book yb1-x90f would hang on boot every couple of boots.

The problem was that bq25890_charger_external_power_changed() dereferences bq->charger, which gets sets in bq25890_power_supply_init() like this:

  bq->charger = devm_power_supply_register(bq->dev, &bq->desc, &psy_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 bq25890_charger_external_power_changed() may get called while bq->charger has not been set yet leading to a NULL pointer dereference.

This race hits on the yb1-x90f when the cht_wcove_pwrsrc (extcon) psy is done with detecting the charger, which happens to exactly hit the window:

      BUG: kernel NULL pointer dereference, address: 0000000000000018
      <snip>
      RIP: 0010:__power_supply_is_supplied_by+0xb/0xb0
      <snip>
      Call Trace:
       <TASK>
       __power_supply_get_supplier_property+0x19/0x50
       class_for_each_device+0xb1/0xe0
       power_supply_get_property_from_supplier+0x2e/0x50
       bq25890_charger_external_power_changed+0x38/0x1b0 [bq25890_charger]
       __power_supply_changed_work+0x30/0x40
       class_for_each_device+0xb1/0xe0
       power_supply_changed_work+0x5f/0xe0
      <snip>

This series fixes this issue in the bq25890 + 3 other drivers with the same issue. Patches 5-6 are small cleanup patches for 2 other drivers which I audited for the same issue.

Regards,

Hans

Hans de Goede (6):
power: supply: ab8500: Fix external_power_changed race
power: supply: axp288_fuel_gauge: Fix external_power_changed race
power: supply: bq25890: Fix external_power_changed race
power: supply: sc27xx: Fix external_power_changed race
power: supply: max17042_battery: Refactor

    max17042_external_power_changed()
  power: supply: twl4030_madc_battery: Refactor
    twl4030_madc_bat_ext_changed()
 drivers/power/supply/ab8500_btemp.c         | 6 ++----
 drivers/power/supply/ab8500_fg.c            | 6 ++----
 drivers/power/supply/axp288_fuel_gauge.c    | 2 +-
 drivers/power/supply/bq25890_charger.c      | 2 +-
 drivers/power/supply/max17042_battery.c     | 7 +------
 drivers/power/supply/sc27xx_fuel_gauge.c    | 9 +--------
 drivers/power/supply/twl4030_madc_battery.c | 8 +-------
 7 files changed, 9 insertions(+), 31 deletions(-)
Signature · 1 line
2.39.1