Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-06 12:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init

Browse Source 
calgary_init's for loop does not correspond to the actual device being
checked, which makes its upperbound check for array overflow useless.
Changing this to a do-while loop is the correct way of doing this.
There should be no possibility of spinning forever in this loop, as
pci_get_device states that it will go through all iterations, then
return NULL (thus breaking the loop).

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Jon Mason 2006-10-05 18:47:21 +02:00 committed by Andi Kleen
parent 814eadcefe
commit dedc9937e8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86_64/kernel/pci-calgary.c
View File

@ -816,6 +816,8 @@ static int __init calgary_init_one(struct pci_dev *dev)
void __iomem *bbar; void __iomem *bbar;
int ret; int ret;
BUG_ON(dev->bus->number >= MAX_PHB_BUS_NUM);
address = locate_register_space(dev); address = locate_register_space(dev);
/* map entire 1MB of Calgary config space */ /* map entire 1MB of Calgary config space */
bbar = ioremap_nocache(address, 1024 * 1024); bbar = ioremap_nocache(address, 1024 * 1024);
@ -842,10 +844,10 @@ done:
static int __init calgary_init(void) static int __init calgary_init(void)
{ {
int i, ret = -ENODEV; int ret = -ENODEV;
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
for (i = 0; i < MAX_PHB_BUS_NUM; i++) { do {
dev = pci_get_device(PCI_VENDOR_ID_IBM, dev = pci_get_device(PCI_VENDOR_ID_IBM,
PCI_DEVICE_ID_IBM_CALGARY, PCI_DEVICE_ID_IBM_CALGARY,
dev); dev);
@ -861,12 +863,12 @@ static int __init calgary_init(void)
ret = calgary_init_one(dev); ret = calgary_init_one(dev);
if (ret) if (ret)
goto error; goto error;
} } while (1);
return ret; return ret;
error: error:
for (i--; i >= 0; i--) { do {
dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM, dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
PCI_DEVICE_ID_IBM_CALGARY, PCI_DEVICE_ID_IBM_CALGARY,
dev); dev);
@ -882,7 +884,7 @@ error:
calgary_disable_translation(dev); calgary_disable_translation(dev);
calgary_free_bus(dev); calgary_free_bus(dev);
pci_dev_put(dev); /* Undo calgary_init_one()'s pci_dev_get() */ pci_dev_put(dev); /* Undo calgary_init_one()'s pci_dev_get() */
} } while (1);
return ret; return ret;
} }