lkml.org 
[lkml]   [2020]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 15/24] hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
    Date
    From: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>

    [ 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>
    ---
    drivers/hwmon/acpi_power_meter.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
    index e27f7e12c05bb..9b4ad6c74041e 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:
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-07 17:14    [W:4.274 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site