powerpc/iseries: fix possible null pointer dereference in iSeries_pcibios_fixup_resources

PATCH New Denis Kirjanov 1 participant 1 message Jun 16, 2010 PowerPC

Share & tools

Denis Kirjanov

author

2010-06-16 15:17 UTC #0 lore raw

PATCH 1/1 powerpc/iseries: fix possible null pointer dereference in iSeries_pcibios_fixup_resources

I don't know if this is a right fix for the problem
since of_get_property can return NULL.
Since iseries_device_information is used only for informational purpose, we can skip this function without valid HvSubBusNumber number.

Signed-off-by Denis Kirjanov <[email protected]>

---
arch/powerpc/platforms/iseries/pci.c | 6 +++++-

 1 files changed, 5 insertions(+), 1 deletions(-)

arch/powerpc/platforms/iseries/pci.c +5 -1

index 3fc2e64..ab3962b 100644
@@ -445,7 +445,11 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)
 	}
 
 	allocate_device_bars(pdev);
-	iseries_device_information(pdev, bus, *sub_bus);
+	if (likely(sub_bus))
+		iseries_device_information(pdev, bus, *sub_bus);
+	else
+		printk(KERN_ERR "PCI: Device node %s has missing or invalid "
+				"linux,subbus property\n", node->full_name);
 }
 
 /*