Skip to contentSkip to conversation

PCI: Prevent NULL dereference during pciehp probe

PATCH Applied Andreas Noever 4 participants 6 messages Jun 9, 2014 – Sep 23, 2014 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: Prevent NULL dereference during pciehp probe

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.

---
 drivers/pci/hotplug/pciehp_core.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/pci/hotplug/pciehp_core.c +7 -0
index 0e0a2ff..e5abcaf 100644
@@ -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");
Signature · 1 line
2.0.0
#1 lore raw

Hello Bjorn,

I think this patch needs to be applied to all -stable branches (all the way back to 3.2).

I encounter this same issue on my platform that is running 3.14.y.

Thanks,

Rajat

Quoted 46 lines

-----Original Message-----
From: [email protected] [mailto:linux-pci- [email protected]] On Behalf Of Andreas Noever
Sent: Monday, June 09, 2014 2:04 PM
To: [email protected]; Bjorn Helgaas; [email protected]
Cc: Andreas Noever
Subject: [PATCH] PCI: Prevent NULL dereference during pciehp probe

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.

---
 drivers/pci/hotplug/pciehp_core.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/pci/hotplug/pciehp_core.c +7 -1
index 0e0a2ff..e5abcaf 100644
@@ -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-pci" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 6 lines · Rajat Jain

Hello Bjorn,

I think this patch needs to be applied to all -stable branches (all the way back to 3.2).

I encounter this same issue on my platform that is running 3.14.y.

Bjorn,

can you send this to -stable, or is it ok if I do it ?

Thanks,
Guenter

Quoted 50 lines

Thanks,

Rajat

Quoted 46 lines

-----Original Message-----
From: [email protected] [mailto:linux-pci- [email protected]] On Behalf Of Andreas Noever
Sent: Monday, June 09, 2014 2:04 PM
To: [email protected]; Bjorn Helgaas; [email protected]
Cc: Andreas Noever
Subject: [PATCH] PCI: Prevent NULL dereference during pciehp probe

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.

---
 drivers/pci/hotplug/pciehp_core.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/pci/hotplug/pciehp_core.c +7 -1
index 0e0a2ff..e5abcaf 100644
@@ -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-pci" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

maintainer
#3 lore raw
Quoted 10 lines · Guenter Roeck
Quoted 6 lines · Rajat Jain

Hello Bjorn,

I think this patch needs to be applied to all -stable branches (all the way back to 3.2).

I encounter this same issue on my platform that is running 3.14.y.

Bjorn,

can you send this to -stable, or is it ok if I do it ?

I forgot to mention it, but I did mark it for stable, so it should happen automatically:

https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?h=pci/hotplug&id=bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3

Quoted 46 lines
Quoted 46 lines
Quoted 46 lines

-----Original Message-----
From: [email protected] [mailto:linux-pci- [email protected]] On Behalf Of Andreas Noever
Sent: Monday, June 09, 2014 2:04 PM
To: [email protected]; Bjorn Helgaas; [email protected]
Cc: Andreas Noever
Subject: [PATCH] PCI: Prevent NULL dereference during pciehp probe

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.

---
 drivers/pci/hotplug/pciehp_core.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/pci/hotplug/pciehp_core.c +7 -1
index 0e0a2ff..e5abcaf 100644
@@ -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-pci" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

#4 lore raw
Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Guenter Roeck
Quoted 6 lines · Rajat Jain

Hello Bjorn,

I think this patch needs to be applied to all -stable branches (all the way back to 3.2).

I encounter this same issue on my platform that is running 3.14.y.

Quoted 8 lines
Quoted 3 lines

Bjorn,

can you send this to -stable, or is it ok if I do it ?

I forgot to mention it, but I did mark it for stable, so it should happen automatically:

https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?h=pci/hotplug&id=bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3

Ah, sorry, I didn't realize that.

Thanks,
Guenter

maintainer Applied
#5 lore raw
In reply to Andreas Noever
Quoted 8 lines · Andreas Noever

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.

Applied to pci/hotplug for v3.18, thanks!

Quoted 25 lines
---
 drivers/pci/hotplug/pciehp_core.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/pci/hotplug/pciehp_core.c +7 -0
index 0e0a2ff..e5abcaf 100644
@@ -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");
Signature · 1 line
2.0.0