From: Guenter Roeck <linux@roeck-us.net>
To: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Cc: linux-hwmon@vger.kernel.org
Subject: Re: [PATCH] hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
Date: Thu, 25 Jun 2020 06:51:07 -0700 [thread overview]
Message-ID: <20200625135107.GA128565@roeck-us.net> (raw)
In-Reply-To: <20200625043242.31175-1-misono.tomohiro@jp.fujitsu.com>
On Thu, Jun 25, 2020 at 01:32:42PM +0900, Misono Tomohiro wrote:
> Although it rarely happens, we should call free_capabilities()
> if error happens after read_capabilities() to free allocated strings.
>
> Fixes: commit de584afa5e188 ("hwmon driver for ACPI 4.0 power meters")
> Signed-off-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Applied.
Thanks,
Guenter
> ---
> 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 0db8ef4fd6e1..a270b975e90b 100644
> --- a/drivers/hwmon/acpi_power_meter.c
> +++ b/drivers/hwmon/acpi_power_meter.c
> @@ -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:
prev parent reply other threads:[~2020-06-25 13:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 4:32 [PATCH] hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add() Misono Tomohiro
2020-06-25 13:51 ` Guenter Roeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200625135107.GA128565@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-hwmon@vger.kernel.org \
--cc=misono.tomohiro@jp.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).