Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423297Ab2KOJQN (ORCPT ); Thu, 15 Nov 2012 04:16:13 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:51259 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422999Ab2KOJQK (ORCPT ); Thu, 15 Nov 2012 04:16:10 -0500 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <50A4B2B8.9030406@jp.fujitsu.com> Date: Thu, 15 Nov 2012 18:15:36 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Wen Congyang CC: , , , Len Brown , "Rafael J. Wysocki" , Andrew Morton , Lai Jiangshan , Jiang Liu , KOSAKI Motohiro , Minchan Kim , Mel Gorman , David Rientjes , Konrad Rzeszutek Wilk , Toshi Kani , Jiang Liu , Benjamin Herrenschmidt , Paul Mackerras , Christoph Lameter Subject: Re: [Patch v5 3/7] acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug References: <1352962777-24407-1-git-send-email-wency@cn.fujitsu.com> <1352962777-24407-4-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1352962777-24407-4-git-send-email-wency@cn.fujitsu.com> Content-Type: text/plain; charset="ISO-2022-JP" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3158 Lines: 98 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 > CC: Jiang Liu > CC: Len Brown > CC: Benjamin Herrenschmidt > CC: Paul Mackerras > CC: Christoph Lameter > Cc: Minchan Kim > CC: Andrew Morton > CC: KOSAKI Motohiro > CC: Yasuaki Ishimatsu > CC: Rafael J. Wysocki > CC: Konrad Rzeszutek Wilk > Signed-off-by: Wen Congyang > --- Reviewed-by: Yasuaki Ishimatsu 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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/