diff options
| author | Andreas Noever <andreas.noever@gmail.com> | 2014-09-16 15:16:02 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-16 15:16:02 -0600 |
| commit | 4da4f2be0e451f03f89a507327aafa3cca074f09 (patch) | |
| tree | 7cff0a11926205c5d81e0fe984834ed882d58306 | |
| parent | d537a3abb4b7085ebc3ce35e64acbad8ece1eece (diff) | |
| download | linux-4da4f2be0e451f03f89a507327aafa3cca074f09.tar.gz | |
PCI: Prevent NULL dereference during pciehp 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+
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 07aa722bb12c..3a5e7e28b874 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -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"); |