Commit b1b166b7 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras

[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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0094f2cd
...@@ -442,9 +442,10 @@ static int __init pcibios_init(void) ...@@ -442,9 +442,10 @@ static int __init pcibios_init(void)
hose->last_busno = 0xff; hose->last_busno = 0xff;
bus = pci_scan_bus_parented(hose->parent, hose->first_busno, bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
hose->ops, hose); hose->ops, hose);
if (bus) if (bus) {
pci_bus_add_devices(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) if (pci_assign_all_buses || next_busno <= hose->last_busno)
next_busno = hose->last_busno + pcibios_assign_bus_offset; next_busno = hose->last_busno + pcibios_assign_bus_offset;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment