lkml.org 
[lkml]   [2018]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 13/77] PCI: keystone: Fix interrupt-controller-node lookup
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit eac56aa3bc8af3d9b9850345d0f2da9d83529134 upstream.

    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: 0c4ffcfe1fbc ("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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/pci/host/pci-keystone.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/pci/host/pci-keystone.c
    +++ b/drivers/pci/host/pci-keystone.c
    @@ -181,7 +181,7 @@ static int ks_pcie_get_irq_controller_in
    }

    /* 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;
    @@ -190,6 +190,7 @@ static int ks_pcie_get_irq_controller_in
    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;
    }

    @@ -207,6 +208,8 @@ static int ks_pcie_get_irq_controller_in
    break;
    }

    + of_node_put(*np_temp);
    +
    if (temp) {
    *num_irqs = temp;
    return 0;

    \
     
     \ /
      Last update: 2018-02-21 15:32    [W:4.117 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site