Commit 32f638fc authored Oct 30, 2014 by Yinghai Lu Committed by Bjorn Helgaas Nov 05, 2014

PCI: Don't oops on virtual buses in acpi_pci_get_bridge_handle()

acpi_pci_get_bridge_handle() returns the ACPI handle for the bridge device
(either a host bridge or a PCI-to-PCI bridge) leading to a PCI bus.  But
SR-IOV virtual functions can be on a virtual bus with no bridge leading to
it.  Return a NULL acpi_handle in this case instead of trying to
dereference the NULL pointer to the bridge.

This fixes a NULL pointer dereference oops in pci_get_hp_params() when
adding SR-IOV VF devices on virtual buses.

[bhelgaas: changelog, add comment in code]
Fixes: 6cd33649 ("PCI: Add pci_configure_device() during enumeration")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=87591


Reported-by: Chao Zhou <chao.zhou@intel.com>
Reported-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

parent d8e7d53a

include/linux/pci-acpi.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -41,8 +41,13 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)

		if (pci_is_root_bus(pbus))
		dev = pbus->bridge;
		else
		else {
		/* If pbus is a virtual bus, there is no bridge to it */
		if (!pbus->self)
		return NULL;

		dev = &pbus->self->dev;
		}

		return ACPI_HANDLE(dev);
		}