lkml.org 
[lkml]   [2012]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/8] fix memory leak when memory device is unbound from the module acpi_memhotplug
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;
> }


\
 
 \ /
  Last update: 2012-06-27 06:41    [W:0.155 / U:0.436 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site