From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 3/8] x86, PCI: Fix memleak with get_current_resources
Date: Sun, 26 Feb 2012 15:33:17 -0800 [thread overview]
Message-ID: <1330299202-3838-4-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1330299202-3838-1-git-send-email-yinghai@kernel.org>
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 res 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 have local info.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/pci/acpi.c | 49 ++++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 19 deletions(-)
Index: linux-2.6/arch/x86/pci/acpi.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/acpi.c
+++ linux-2.6/arch/x86/pci/acpi.c
@@ -305,49 +305,55 @@ static void add_resources(struct pci_roo
}
}
+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
-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)
{
- struct pci_root_info info;
size_t size;
- info.bridge = device;
- info.res_num = 0;
- info.resources = resources;
+ info->bridge = device;
+ info->res_num = 0;
+ info->resources = resources;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
- &info);
- if (!info.res_num)
+ info);
+ if (!info->res_num)
return;
- size = sizeof(*info.res) * info.res_num;
- info.res = kmalloc(size, GFP_KERNEL);
- if (!info.res)
+ size = sizeof(*info->res) * info->res_num;
+ info->res = kmalloc(size, GFP_KERNEL);
+ if (!info->res)
return;
- info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
- if (!info.name)
+ info->name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
+ if (!info->name)
goto name_alloc_fail;
- info.res_num = 0;
+ info->res_num = 0;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
- &info);
+ info);
if (pci_use_crs) {
- add_resources(&info);
+ add_resources(info);
return;
}
- kfree(info.name);
-
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 acpi_device *device = root->device;
+ struct pci_root_info info;
int domain = root->segment;
int busnum = root->secondary.start;
LIST_HEAD(resources);
@@ -392,6 +398,7 @@ struct pci_bus * __devinit pci_acpi_scan
sd->domain = domain;
sd->node = node;
+ memset(&info, 0, sizeof(struct pci_root_info));
/*
* 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.
@@ -405,7 +412,8 @@ struct pci_bus * __devinit pci_acpi_scan
memcpy(bus->sysdata, sd, sizeof(*sd));
kfree(sd);
} 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
@@ -419,6 +427,9 @@ struct pci_bus * __devinit pci_acpi_scan
bus->subordinate = pci_scan_child_bus(bus);
else
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,
next prev parent reply other threads:[~2012-02-26 23:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-26 23:33 [PATCH 0/8] PCI: pci_host_bridge related cleanup Yinghai Lu
2012-02-26 23:33 ` [PATCH 1/8] PCI: Separate host_bridge code out from probe.c Yinghai Lu
2012-02-26 23:33 ` [PATCH 2/8] x86, PCI: have own version for pcibios_bus_to_resource Yinghai Lu
2012-02-27 17:34 ` Bjorn Helgaas
2012-02-26 23:33 ` Yinghai Lu [this message]
2012-02-26 23:33 ` [PATCH 4/8] PCI: make pci_host_bridge more robust Yinghai Lu
2012-02-27 17:44 ` Bjorn Helgaas
2012-02-26 23:33 ` [PATCH 5/8] PCI: add generic device into pci_host_bridge struct Yinghai Lu
2012-02-27 17:57 ` Bjorn Helgaas
2012-02-27 19:08 ` Yinghai Lu
2012-02-27 19:17 ` Bjorn Helgaas
2012-02-27 20:49 ` Yinghai Lu
2012-02-27 22:24 ` Bjorn Helgaas
2012-02-27 22:55 ` Yinghai Lu
2012-02-27 23:00 ` Bjorn Helgaas
2012-02-26 23:33 ` [PATCH 6/8] PCI: add host bridge release support Yinghai Lu
2012-02-26 23:33 ` [PATCH 7/8] x86, PCI: break down get_current_resource() Yinghai Lu
2012-02-26 23:33 ` [PATCH 8/8] x86, PCI: add host bridge resource release for using _CRS Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330299202-3838-4-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).