On Mon, Jun 09, 2014 at 11:03:32PM +0200, Andreas Noever wrote:
> pciehp assumes that dev->subordinate exists. But we do not assign a 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 subordinate bus is
> present.
>
> Signed-off-by: Andreas Noever <andreas.noe...@gmail.com>
Applied to pci/hotplug for v3.18, thanks!
> ---
> drivers/pci/hotplug/pciehp_core.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/pci/hotplug/pciehp_core.c
> b/drivers/pci/hotplug/pciehp_core.c
> index 0e0a2ff..e5abcaf 100644
> --- a/drivers/pci/hotplug/pciehp_core.c
> +++ b/drivers/pci/hotplug/pciehp_core.c
> @@ -255,6 +255,13 @@ static int pciehp_probe(struct pcie_device *dev)
> else if (pciehp_acpi_slot_detection_check(dev->port))
> 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");
> --
> 2.0.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
