lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 059/138] irqchip/gic-v3: Fix ppi-partitions lookup
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <johan@kernel.org>

    commit 00ee9a1ca5080202bc37b44e998c3b2c74d45817 upstream.

    Fix child-node lookup during initialisation, which 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 gic node was prematurely freed, while
    the ppi-partitions node was leaked.

    Fixes: e3825ba1af3a ("irqchip/gic-v3: Add support for partitioned PPIs")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/irqchip/irq-gic-v3.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/irqchip/irq-gic-v3.c
    +++ b/drivers/irqchip/irq-gic-v3.c
    @@ -1022,18 +1022,18 @@ static void __init gic_populate_ppi_part
    int nr_parts;
    struct partition_affinity *parts;

    - parts_node = of_find_node_by_name(gic_node, "ppi-partitions");
    + parts_node = of_get_child_by_name(gic_node, "ppi-partitions");
    if (!parts_node)
    return;

    nr_parts = of_get_child_count(parts_node);

    if (!nr_parts)
    - return;
    + goto out_put_node;

    parts = kzalloc(sizeof(*parts) * nr_parts, GFP_KERNEL);
    if (WARN_ON(!parts))
    - return;
    + goto out_put_node;

    for_each_child_of_node(parts_node, child_part) {
    struct partition_affinity *part;
    @@ -1100,6 +1100,9 @@ static void __init gic_populate_ppi_part

    gic_data.ppi_descs[i] = desc;
    }
    +
    +out_put_node:
    + of_node_put(parts_node);
    }

    static void __init gic_of_setup_kvm_info(struct device_node *node)

    \
     
     \ /
      Last update: 2017-11-28 11:35    [W:4.828 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site