All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Rientjes <rientjes@google.com>
To: Wen Congyang <wency@cn.fujitsu.com>
Cc: lenb@kernel.org, linux-acpi@vger.kernel.org,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>
Subject: Re: [PATCH 1/8] fix memory leak when memory device is unbound from the module acpi_memhotplug
Date: Tue, 26 Jun 2012 21:10:48 -0700 (PDT)	[thread overview]
Message-ID: <alpine.DEB.2.00.1206262108050.24245@chino.kir.corp.google.com> (raw)
In-Reply-To: <4FE97E86.60603@cn.fujitsu.com>

On Tue, 26 Jun 2012, Wen Congyang wrote:

> We allocate memory to store acpi_memory_info, so we should free it before
> freeing mem_device.
> 
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> ---
>  drivers/acpi/acpi_memhotplug.c |   18 +++++++++++++-----
>  1 files changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index d985713..f6831d1 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -399,6 +399,18 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
>  	return;
>  }
>  
> +static void acpi_free_memory_device(struct acpi_memory_device *mem_device)
> +{

The function that allocates struct acpi_memory_device is 
acpi_memory_device_add(), shouldn't this be called acpi_memory_device_free()?

> +	struct acpi_memory_info *info, *n;
> +
> +	if (!mem_device)
> +		return;
> +
> +	list_for_each_entry_safe(info, n, &mem_device->res_list, list)
> +		kfree(info);

Duplicates code from acpi_memory_get_device_resources(), should be moved 
into a seperate function.

> +	kfree(mem_device);
> +}
> +
>  static int acpi_memory_device_add(struct acpi_device *device)
>  {
>  	int result;
> @@ -451,14 +463,10 @@ static int acpi_memory_device_add(struct acpi_device *device)
>  
>  static int acpi_memory_device_remove(struct acpi_device *device, int type)
>  {
> -	struct acpi_memory_device *mem_device = NULL;
> -
> -
>  	if (!device || !acpi_driver_data(device))
>  		return -EINVAL;
>  
> -	mem_device = acpi_driver_data(device);
> -	kfree(mem_device);
> +	acpi_free_memory_device(acpi_driver_data(device));
>  
>  	return 0;
>  }

  reply	other threads:[~2012-06-27  4:10 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-26  9:16 [PATCH 0/8] some fixes about acpi_memhotplug Wen Congyang
2012-06-26  9:19 ` [PATCH 1/8] fix memory leak when memory device is unbound from the module acpi_memhotplug Wen Congyang
2012-06-27  4:10   ` David Rientjes [this message]
2012-06-26  9:19 ` [PATCH 2/8] free memory device if acpi_memory_enable_device() failed Wen Congyang
2012-06-27  4:12   ` David Rientjes
2012-06-26  9:20 ` [PATCH 3/8] remove memory info from list before freeing it Wen Congyang
2012-06-27  4:15   ` David Rientjes
2012-06-26  9:20 ` [PATCH 4/8] donot allow to eject the memory device if it is being used Wen Congyang
2012-06-27  4:21   ` David Rientjes
2012-06-28  2:01     ` Wen Congyang
2012-06-26  9:21 ` [PATCH 5/8] don't print message if request_resource() failed Wen Congyang
2012-06-27  4:23   ` David Rientjes
2012-06-28  2:46     ` Wen Congyang
2012-06-26  9:21 ` [PATCH 6/8] bind the memory device when the driver is being loaded Wen Congyang
2012-06-26 15:53   ` Konrad Rzeszutek Wilk
2012-06-27  4:24   ` David Rientjes
2012-06-26  9:22 ` [PATCH 7/8] auto bind the memory device which is hotpluged before the driver is loaded Wen Congyang
2012-06-26 17:06   ` Konrad Rzeszutek Wilk
2012-06-27  4:33     ` David Rientjes
2012-06-26  9:23 ` [PATCH 8/8] release memory resources if hotadd_new_pgdat() failed Wen Congyang
2012-06-27  4:29   ` David Rientjes

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=alpine.DEB.2.00.1206262108050.24245@chino.kir.corp.google.com \
    --to=rientjes@google.com \
    --cc=isimatu.yasuaki@jp.fujitsu.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=wency@cn.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.