diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-21 14:53:27 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 22:14:07 +1100 |
| commit | b1b166b7ea2ec15700a8ba5c6ec99c2f9ecad89e (patch) | |
| tree | 066e5c4b1ed75eefbd3d443fe8a87f1f61fc9648 /arch/powerpc/kernel/pci_32.c | |
| parent | 0094f2cdcfb6f2132b2ea3b4e85e0f6899c8595b (diff) | |
| download | linux-b1b166b7ea2ec15700a8ba5c6ec99c2f9ecad89e.tar.bz2 | |
[POWERPC] Fix possible NULL deref in ppc32 PCI
The 32-bit PCI code tests if "bus" is non-NULL after calling
pci_scan_bus_parented() in one place but not another before
dereferencing it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
| -rw-r--r-- | arch/powerpc/kernel/pci_32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 37cb7b944319..a9c6cb24aab0 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c @@ -442,9 +442,10 @@ static int __init pcibios_init(void) hose->last_busno = 0xff; bus = pci_scan_bus_parented(hose->parent, hose->first_busno, hose->ops, hose); - if (bus) + if (bus) { pci_bus_add_devices(bus); - hose->last_busno = bus->subordinate; + hose->last_busno = bus->subordinate; + } if (pci_assign_all_buses || next_busno <= hose->last_busno) next_busno = hose->last_busno + pcibios_assign_bus_offset; } |