diff options
| author | Qiushi Wu <wu000273@umn.edu> | 2020-05-03 01:33:38 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2020-05-03 02:17:13 +0200 |
| commit | 1d7a7128a2e9e1f137c99b0a44e94d70a77343e3 (patch) | |
| tree | 8b3230a644063cbaffed7dd23c75f2c5fd645d31 /drivers/power | |
| parent | dt-bindings: power: Convert power_supply text to yaml (diff) | |
| download | linux-1d7a7128a2e9e1f137c99b0a44e94d70a77343e3.tar.xz linux-1d7a7128a2e9e1f137c99b0a44e94d70a77343e3.zip | |
power: supply: core: fix memory leak in HWMON error path
In function power_supply_add_hwmon_sysfs(), psyhw->props is
allocated by bitmap_zalloc(). But this pointer is not deallocated
when devm_add_action fail, which lead to a memory leak bug. To fix
this, we replace devm_add_action with devm_add_action_or_reset.
Cc: stable@kernel.org
Fixes: e67d4dfc9ff19 ("power: supply: Add HWMON compatibility layer")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/power_supply_hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c index f5d538485aaa..7fe4b6b6ddc8 100644 --- a/drivers/power/supply/power_supply_hwmon.c +++ b/drivers/power/supply/power_supply_hwmon.c @@ -358,7 +358,7 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy) goto error; } - ret = devm_add_action(dev, power_supply_hwmon_bitmap_free, + ret = devm_add_action_or_reset(dev, power_supply_hwmon_bitmap_free, psyhw->props); if (ret) goto error; |