Skip to content

Commit 8363ccb

Browse files
JuliaLawallrobherring
authored andcommitted
of/irq: add missing of_node_put
for_each_matching_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. A simplified version of the semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr): // <smpl> @@ local idexpression n; expression e; identifier l; @@ for_each_matching_node(n,...) { ... ( of_node_put(n); | e = n | + of_node_put(n); ? goto l; ) ... } ... l: ... when != n // </smpl> Besides the issue found by the semantic patch, this code also stores the device_node value in a list, which requires an of_node_get, and then cleans up the list on exit from the function, which requires an of_node_put. Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Rob Herring <[email protected]>
1 parent 855ff28 commit 8363ccb

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/of/irq.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,10 +501,12 @@ void __init of_irq_init(const struct of_device_id *matches)
501501
* pointer, interrupt-parent device_node etc.
502502
*/
503503
desc = kzalloc(sizeof(*desc), GFP_KERNEL);
504-
if (WARN_ON(!desc))
504+
if (WARN_ON(!desc)) {
505+
of_node_put(np);
505506
goto err;
507+
}
506508

507-
desc->dev = np;
509+
desc->dev = of_node_get(np);
508510
desc->interrupt_parent = of_irq_find_parent(np);
509511
if (desc->interrupt_parent == np)
510512
desc->interrupt_parent = NULL;
@@ -575,6 +577,7 @@ void __init of_irq_init(const struct of_device_id *matches)
575577
err:
576578
list_for_each_entry_safe(desc, temp_desc, &intc_desc_list, list) {
577579
list_del(&desc->list);
580+
of_node_put(desc->dev);
578581
kfree(desc);
579582
}
580583
}

0 commit comments

Comments
 (0)