Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9426817 authored by Misono Tomohiro's avatar Misono Tomohiro Committed by Greg Kroah-Hartman
Browse files

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: de584afa ("hwmon driver for ACPI 4.0 power meters")
Signed-off-by: default avatarMisono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Link: https://lore.kernel.org/r/20200625043242.31175-1-misono.tomohiro@jp.fujitsu.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3e7bd7e1

drivers/hwmon/acpi_power_meter.c

+3 −1
Original line number Diff line number Diff line
@@ -883,7 +883,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)) {
@@ -896,6 +896,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: