2012/11/15 15:59, Wen Congyang wrote:
> We allocate memory to store acpi_memory_info, so we should free it before
> freeing mem_device.
>
> CC: David Rientjes <rientjes@xxxxxxxxxx>
> CC: Jiang Liu <liuj97@xxxxxxxxx>
> CC: Len Brown <len.brown@xxxxxxxxx>
> CC: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> CC: Paul Mackerras <paulus@xxxxxxxxx>
> CC: Christoph Lameter <cl@xxxxxxxxx>
> Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> CC: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
> CC: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
> CC: Rafael J. Wysocki <rjw@xxxxxxx>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx>
> ---
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
Thanks,
Yasuaki Ishimatsu
> drivers/acpi/acpi_memhotplug.c | 27 +++++++++++++++++++++------
> 1 file changed, 21 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
> index 6e12042..c5e7b6d 100644
> --- a/drivers/acpi/acpi_memhotplug.c
> +++ b/drivers/acpi/acpi_memhotplug.c
> @@ -125,12 +125,20 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context)
> return AE_OK;
> }
>
> +static void
> +acpi_memory_free_device_resources(struct acpi_memory_device *mem_device)
> +{
> + struct acpi_memory_info *info, *n;
> +
> + list_for_each_entry_safe(info, n, &mem_device->res_list, list)
> + kfree(info);
> + INIT_LIST_HEAD(&mem_device->res_list);
> +}
> +
> static int
> acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
> {
> acpi_status status;
> - struct acpi_memory_info *info, *n;
> -
>
> if (!list_empty(&mem_device->res_list))
> return 0;
> @@ -138,9 +146,7 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
> status = acpi_walk_resources(mem_device->device->handle, METHOD_NAME__CRS,
> acpi_memory_get_resource, mem_device);
> if (ACPI_FAILURE(status)) {
> - list_for_each_entry_safe(info, n, &mem_device->res_list, list)
> - kfree(info);
> - INIT_LIST_HEAD(&mem_device->res_list);
> + acpi_memory_free_device_resources(mem_device);
> return -EINVAL;
> }
>
> @@ -363,6 +369,15 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
> return;
> }
>
> +static void acpi_memory_device_free(struct acpi_memory_device *mem_device)
> +{
> + if (!mem_device)
> + return;
> +
> + acpi_memory_free_device_resources(mem_device);
> + kfree(mem_device);
> +}
> +
> static int acpi_memory_device_add(struct acpi_device *device)
> {
> int result;
> @@ -427,7 +442,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type)
> if (result)
> return result;
>
> - kfree(mem_device);
> + acpi_memory_device_free(mem_device);
>
> return 0;
> }
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>