Re: ACPI boot memory leaks in 2.6.32-rc1/2

[Bjorn Helgaas]

On Tuesday 29 September 2009 03:18:53 am Zdenek Kabelac wrote:
> My qemu guest seems to be reporting now 46 memleaks  ACPI related.

Thanks a lot for the report!

Can you verify that the patch below fixes these leaks?


commit fff7774a805e392ce258f0342e48cbe682ef2b9b
Author: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Date:   Tue Sep 29 10:32:19 2009 -0600

    ACPI: fix bus scanning memory leaks
    
    Free an acpi_get_object_info() buffer when we're finished.  Skip the
    acpi_get_name() altogether -- it was only used for a printk that was
    really just for debug anyway.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
    Reported-by: Zdenek Kabelac <zdenek.kabelac@xxxxxxxxx>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 468921b..14a7481 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1052,6 +1052,8 @@ static void acpi_device_set_id(struct acpi_device *device)
 			device->flags.bus_address = 1;
 		}
 
+		kfree(info);
+
 		/*
 		 * Some devices don't reliably have _HIDs & _CIDs, so add
 		 * synthetic HIDs to make sure drivers can find them.
@@ -1325,13 +1327,8 @@ static int acpi_bus_scan(acpi_handle handle, struct acpi_bus_ops *ops,
 			 struct acpi_device **child)
 {
 	acpi_status status;
-	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 	void *device = NULL;
 
-	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-	printk(KERN_INFO PREFIX "Enumerating devices from [%s]\n",
-	       (char *) buffer.pointer);
-
 	status = acpi_bus_check_add(handle, 0, ops, &device);
 	if (ACPI_SUCCESS(status))
 		acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/