Commit bceee4a9 authored Sep 16, 2014 by Andreas Noever Committed by Bjorn Helgaas Sep 16, 2014

PCI: pciehp: Prevent NULL dereference during probe



pciehp assumes that dev->subordinate, the struct pci_bus for a bridge's
secondary bus, exists.  But we do not create that bus if we run out of bus
numbers during enumeration.  This leads to a NULL dereference in
init_slot() (and other places).

Change pciehp_probe() to return -ENODEV when no secondary bus is present.

Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# v3.2+

parent d537a3ab

drivers/pci/hotplug/pciehp_core.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,13 @@ static int pciehp_probe(struct pcie_device *dev)
		goto err_out_none;
		}

		if (!dev->port->subordinate) {
		/* Can happen if we run out of bus numbers during probe */
		dev_err(&dev->device,
		"Hotplug bridge without secondary bus, ignoring\n");
		goto err_out_none;
		}

		ctrl = pcie_init(dev);
		if (!ctrl) {
		dev_err(&dev->device, "Controller initialization failed\n");