Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933035AbZIDHAM (ORCPT ); Fri, 4 Sep 2009 03:00:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932981AbZIDHAJ (ORCPT ); Fri, 4 Sep 2009 03:00:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53119 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932722AbZIDHAF (ORCPT ); Fri, 4 Sep 2009 03:00:05 -0400 From: Xiaotian Feng To: len.brown@intel.com, rui.zhang@intel.com, yakui.zhao@intel.com, bjorn.helgaas@hp.com, ak@linux.intel.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaotian Feng Subject: [PATCH] drivers/acpi: fix memory leak in acpi_device_set_id Date: Fri, 4 Sep 2009 15:00:19 +0800 Message-Id: <1252047619-2924-1-git-send-email-dfeng@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1355 Lines: 45 In acpi_device_set_id, if cid_list is allocated by ACPI_ALLOCATE_ZEROED, it is never freed. This patch fixes the memory leak. Signed-off-by: Xiaotian Feng --- drivers/acpi/scan.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 781435d..a0102ad 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1010,6 +1010,7 @@ static void acpi_device_set_id(struct acpi_device *device, struct acpi_compatible_id_list *cid_list = NULL; const char *cid_add = NULL; acpi_status status; + int free_cid_list = 0; switch (type) { case ACPI_BUS_TYPE_DEVICE: @@ -1098,6 +1099,7 @@ static void acpi_device_set_id(struct acpi_device *device, kfree(buffer.pointer); return; } else { + free_cid_list = 1; cid_list->count = 0; cid_list->size = size; } @@ -1124,6 +1126,8 @@ static void acpi_device_set_id(struct acpi_device *device, printk(KERN_ERR PREFIX "Memory allocation error\n"); } + if (free_cid_list) + ACPI_FREE(cid_list); kfree(buffer.pointer); } -- 1.6.2.5 -- 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/