Commit 1cc1c96c authored Feb 20, 2012 by Yinghai Lu Committed by Jesse Barnes Feb 23, 2012

PCI: fix memleak when ACPI _CRS is not used.



warning:
unreferenced object 0xffff8801f6914200 (size 512):
  comm "swapper/0", pid 1, jiffies 4294893643 (age 2664.644s)
  hex dump (first 32 bytes):
    00 00 c0 fe 00 00 00 00 ff ff ff ff 00 00 00 00  ................
    60 58 2f f6 03 88 ff ff 00 02 00 00 00 00 00 00  `X/.............
  backtrace:
    [<ffffffff81c2408c>] kmemleak_alloc+0x26/0x43
    [<ffffffff8113764f>] __kmalloc+0x121/0x183
    [<ffffffff81ca8d93>] get_current_resources+0x5a/0xc6
    [<ffffffff81c5bedd>] pci_acpi_scan_root+0x13c/0x21c
    [<ffffffff81c2a745>] acpi_pci_root_add+0x1e1/0x421
    [<ffffffff81408f50>] acpi_device_probe+0x50/0x190
    [<ffffffff8149edc7>] really_probe+0x99/0x126
    [<ffffffff8149ef83>] driver_probe_device+0x3b/0x56
    [<ffffffff8149effd>] __driver_attach+0x5f/0x82
    [<ffffffff8149d860>] bus_for_each_dev+0x5c/0x88
    [<ffffffff8149eb87>] driver_attach+0x1e/0x20
    [<ffffffff8149e7cc>] bus_add_driver+0xca/0x21d
    [<ffffffff8149f47b>] driver_register+0x91/0xfe
    [<ffffffff81409d09>] acpi_bus_register_driver+0x43/0x45
    [<ffffffff8278bdc9>] acpi_pci_root_init+0x20/0x28
    [<ffffffff810001e7>] do_one_initcall+0x57/0x134

The system has _CRS for root buses, but they are not used because the machine
date is before the cutoff date for _CRS usage.

Try to free those unused resource arrays and names.

Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 45196cee

arch/x86/pci/acpi.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -282,9 +282,6 @@ static void add_resources(struct pci_root_info *info)
		int i;
		struct resource res, root, *conflict;

		if (!pci_use_crs)
		return;

		coalesce_windows(info, IORESOURCE_MEM);
		coalesce_windows(info, IORESOURCE_IO);

		@@ -336,8 +333,13 @@ get_current_resources(struct acpi_device *device, int busnum,
		acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
		&info);

		if (pci_use_crs) {
		add_resources(&info);

		return;
		}

		kfree(info.name);

		name_alloc_fail:
		kfree(info.res);

Admin message