iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] Fix possible NULL deref in ppc32 PCI

Browse Source 
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>
This commit is contained in:
Benjamin Herrenschmidt 2007-12-21 14:53:27 +11:00 committed by Paul Mackerras
parent 0094f2cdcf
commit b1b166b7ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kernel/pci_32.c
View File

@ -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;
} }