Commit eac56aa3 authored Nov 17, 2017 by Johan Hovold Committed by Lorenzo Pieralisi Dec 19, 2017

PCI: keystone: Fix interrupt-controller-node lookup



Fix child-node lookup during initialisation which was using the wrong
OF-helper and ended up searching the whole device tree depth-first
starting at the parent rather than just matching on its children.

To make things worse, the parent pci node could end up being prematurely
freed as of_find_node_by_name() drops a reference to its first argument.
Any matching child interrupt-controller node was also leaked.

Fixes: 0c4ffcfe ("PCI: keystone: Add TI Keystone PCIe driver")
Cc: stable <stable@vger.kernel.org>     # 3.18
Acked-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
[lorenzo.pieralisi@arm.com: updated commit subject]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

parent 1291a0d5

drivers/pci/dwc/pci-keystone.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
		}

		/* interrupt controller is in a child node */
		*np_temp = of_find_node_by_name(np_pcie, controller);
		*np_temp = of_get_child_by_name(np_pcie, controller);
		if (!(*np_temp)) {
		dev_err(dev, "Node for %s is absent\n", controller);
		return -EINVAL;
		@@ -187,6 +187,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
		temp = of_irq_count(*np_temp);
		if (!temp) {
		dev_err(dev, "No IRQ entries in %s\n", controller);
		of_node_put(*np_temp);
		return -EINVAL;
		}

		@@ -204,6 +205,8 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
		break;
		}

		of_node_put(*np_temp);

		if (temp) {
		*num_irqs = temp;
		return 0;

Admin message