diff options
| author | Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> | 2020-06-25 13:32:42 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-09 09:35:08 +0200 |
| commit | c9089545adec85ce4a524deff01f3ddbfa510084 (patch) | |
| tree | 93f555b93041a966aef3da0cdf9fea29e4fafac4 | |
| parent | ec511068d575a8a1110c87203c943df5b18f4a2a (diff) | |
| download | linux-stable-c9089545adec85ce4a524deff01f3ddbfa510084.tar.gz linux-stable-c9089545adec85ce4a524deff01f3ddbfa510084.tar.bz2 linux-stable-c9089545adec85ce4a524deff01f3ddbfa510084.zip | |
hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
[ Upstream commit 8b97f9922211c44a739c5cbd9502ecbb9f17f6d1 ]
Although it rarely happens, we should call free_capabilities()
if error happens after read_capabilities() to free allocated strings.
Fixes: de584afa5e188 ("hwmon driver for ACPI 4.0 power meters")
Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Link: https://lore.kernel.org/r/20200625043242.31175-1-misono.tomohiro@jp.fujitsu.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/hwmon/acpi_power_meter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index e27f7e12c05b..9b4ad6c74041 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -895,7 +895,7 @@ static int acpi_power_meter_add(struct acpi_device *device) res = setup_attrs(resource); if (res) - goto exit_free; + goto exit_free_capability; resource->hwmon_dev = hwmon_device_register(&device->dev); if (IS_ERR(resource->hwmon_dev)) { @@ -908,6 +908,8 @@ static int acpi_power_meter_add(struct acpi_device *device) exit_remove: remove_attrs(resource); +exit_free_capability: + free_capabilities(resource); exit_free: kfree(resource); exit: |