Fix possible NULL deref in ppc32 PCI

PATCH New Benjamin Herrenschmidt 1 participant 1 message Dec 21, 2007 PowerPC

Share & tools

Benjamin Herrenschmidt

author

2007-12-21 03:53 UTC #0 lore raw

PATCH 1/1 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 derefencing it.

Signed-off-by Benjamin Herrenschmidt <[email protected]>

---

 arch/powerpc/kernel/pci_32.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

arch/powerpc/kernel/pci_32.c +3 -2

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