UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

irqchip/gic-v3: Fix ppi-partitions lookup 

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: e3825ba1af ("irqchip/gic-v3: Add support for partitioned PPIs")
Cc: stable <stable@vger.kernel.org>     # 4.7
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Johan Hovold 2017-11-11 17:51:25 +01:00 committed by Marc Zyngier
parent 90dc7122a3
commit 00ee9a1ca5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/irqchip/irq-gic-v3.c
View File

@ -1103,18 +1103,18 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
int nr_parts; int nr_parts;
struct partition_affinity *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) if (!parts_node)
return; return;
nr_parts = of_get_child_count(parts_node); nr_parts = of_get_child_count(parts_node);
if (!nr_parts) if (!nr_parts)
return; goto out_put_node;
parts = kzalloc(sizeof(*parts) * nr_parts, GFP_KERNEL); parts = kzalloc(sizeof(*parts) * nr_parts, GFP_KERNEL);
if (WARN_ON(!parts)) if (WARN_ON(!parts))
return; goto out_put_node;
for_each_child_of_node(parts_node, child_part) { for_each_child_of_node(parts_node, child_part) {
struct partition_affinity *part; struct partition_affinity *part;
@ -1181,6 +1181,9 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
gic_data.ppi_descs[i] = desc; 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) static void __init gic_of_setup_kvm_info(struct device_node *node)