diff options
| author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2007-11-17 16:27:01 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@apollo.(none)> | 2007-11-17 16:27:01 +0100 |
| commit | 3d9befd2cdf65b1768b0d3078a65cc0ae9aa6412 (patch) | |
| tree | 54d2e8ad6cab03beb2834a4bbe568739b068db79 /arch/x86/pci | |
| parent | 05dfa35e84331c6921ab394463069e9376f0bd76 (diff) | |
| download | linux-stable-3d9befd2cdf65b1768b0d3078a65cc0ae9aa6412.tar.gz linux-stable-3d9befd2cdf65b1768b0d3078a65cc0ae9aa6412.tar.bz2 linux-stable-3d9befd2cdf65b1768b0d3078a65cc0ae9aa6412.zip | |
x86: check boundary in count setup resource
need to check info->res_num less than PCI_BUS_NUM_RESOURCES, so
info->bus->resource[info->res_num] = res will not beyond of bus resource
array when acpi returns too many resource entries.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Gary Hade <gary.hade@us.ibm.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/acpi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 2d88f7c6d6ac..7e35078673a4 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -77,6 +77,9 @@ count_resource(struct acpi_resource *acpi_res, void *data) struct acpi_resource_address64 addr; acpi_status status; + if (info->res_num >= PCI_BUS_NUM_RESOURCES) + return AE_OK; + status = resource_to_addr(acpi_res, &addr); if (ACPI_SUCCESS(status)) info->res_num++; @@ -93,6 +96,9 @@ setup_resource(struct acpi_resource *acpi_res, void *data) unsigned long flags; struct resource *root; + if (info->res_num >= PCI_BUS_NUM_RESOURCES) + return AE_OK; + status = resource_to_addr(acpi_res, &addr); if (!ACPI_SUCCESS(status)) return AE_OK; |