On Fri, Oct 24, 2014 at 3:25 AM, Andreas Noever <andreas.noever@xxxxxxxxx> wrote: > Hi Greg, > > it looks like that patch is already in 3.17. I accidentally merged this patch twice, so there are two copies of this hunk in v3.18-rc1. I just reverted one of them. Anyway, you probably don't want to add this to -stable. > On Fri, Oct 24, 2014 at 7:13 AM, <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: >> >> This is a note to let you know that I've just added the patch titled >> >> PCI: pciehp: Prevent NULL dereference during probe >> >> to the 3.17-stable tree which can be found at: >> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary >> >> The filename of the patch is: >> pci-pciehp-prevent-null-dereference-during-probe.patch >> and it can be found in the queue-3.17 subdirectory. >> >> If you, or anyone else, feels it should not be added to the stable tree, >> please let <stable@xxxxxxxxxxxxxxx> know about it. >> >> >> From bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 Mon Sep 17 00:00:00 2001 >> From: Andreas Noever <andreas.noever@xxxxxxxxx> >> Date: Tue, 16 Sep 2014 15:16:02 -0600 >> Subject: PCI: pciehp: Prevent NULL dereference during probe >> >> From: Andreas Noever <andreas.noever@xxxxxxxxx> >> >> commit bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 upstream. >> >> 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@xxxxxxxxx> >> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> >> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> >> >> --- >> drivers/pci/hotplug/pciehp_core.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> --- a/drivers/pci/hotplug/pciehp_core.c >> +++ b/drivers/pci/hotplug/pciehp_core.c >> @@ -262,6 +262,13 @@ static int pciehp_probe(struct pcie_devi >> 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"); >> >> >> Patches currently in stable-queue which might be from andreas.noever@xxxxxxxxx are >> >> queue-3.17/pci-pciehp-prevent-null-dereference-during-probe.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html