android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/PCI: fix memleak with get_current_resources()

Browse Source 
In pci_scan_acpi_root(), when pci_use_crs is set, get_current_resources()
is used to get pci_root_info, and it will allocate name and resource array.

Later if pci_create_root_bus() can not create bus (could be already
there...) it will only free bus res list, but the name and res array is not
freed.

Let get_current_resource() take info pointer instead of using local info.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Yinghai Lu 2012-04-02 18:31:53 -07:00 committed by Bjorn Helgaas
parent 610929e119
commit baa495d9de
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
arch/x86/pci/acpi.c
View File

@ -315,49 +315,55 @@ static void add_resources(struct pci_root_info *info)
} }
} }
static void free_pci_root_info(struct pci_root_info *info)
{
kfree(info->name);
kfree(info->res);
memset(info, 0, sizeof(struct pci_root_info));
}
static void static void
get_current_resources(struct acpi_device *device, int busnum, get_current_resources(struct pci_root_info *info,
struct acpi_device *device, int busnum,
int domain, struct list_head *resources) int domain, struct list_head *resources)
{ {
struct pci_root_info info;
size_t size; size_t size;
info.bridge = device; info->bridge = device;
info.res_num = 0; info->res_num = 0;
info.resources = resources; info->resources = resources;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource, acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
&info); info);
if (!info.res_num) if (!info->res_num)
return; return;
size = sizeof(*info.res) * info.res_num; size = sizeof(*info->res) * info->res_num;
info.res = kmalloc(size, GFP_KERNEL); info->res = kmalloc(size, GFP_KERNEL);
if (!info.res) if (!info->res)
return; return;
info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum); info->name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
if (!info.name) if (!info->name)
goto name_alloc_fail; goto name_alloc_fail;
info.res_num = 0; info->res_num = 0;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource, acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
&info); info);
if (pci_use_crs) { if (pci_use_crs) {
add_resources(&info); add_resources(info);
return; return;
} }
kfree(info.name);
name_alloc_fail: name_alloc_fail:
kfree(info.res); free_pci_root_info(info);
} }
struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
{ {
struct acpi_device *device = root->device; struct acpi_device *device = root->device;
struct pci_root_info info;
int domain = root->segment; int domain = root->segment;
int busnum = root->secondary.start; int busnum = root->secondary.start;
LIST_HEAD(resources); LIST_HEAD(resources);
@ -402,6 +408,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
sd->domain = domain; sd->domain = domain;
sd->node = node; sd->node = node;
memset(&info, 0, sizeof(struct pci_root_info));
/* /*
* Maybe the desired pci bus has been already scanned. In such case * Maybe the desired pci bus has been already scanned. In such case
* it is unnecessary to scan the pci bus with the given domain,busnum. * it is unnecessary to scan the pci bus with the given domain,busnum.
@ -415,7 +422,8 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
memcpy(bus->sysdata, sd, sizeof(*sd)); memcpy(bus->sysdata, sd, sizeof(*sd));
kfree(sd); kfree(sd);
} else { } else {
get_current_resources(device, busnum, domain, &resources); get_current_resources(&info, device, busnum, domain,
&resources);
/* /*
* _CRS with no apertures is normal, so only fall back to * _CRS with no apertures is normal, so only fall back to
@ -429,6 +437,9 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
bus->subordinate = pci_scan_child_bus(bus); bus->subordinate = pci_scan_child_bus(bus);
else else
pci_free_resource_list(&resources); pci_free_resource_list(&resources);
if (!bus && pci_use_crs)
free_pci_root_info(&info);
} }
/* After the PCI-E bus has been walked and all devices discovered, /* After the PCI-E bus has been walked and all devices discovered,