Several PowerPC code paths acquire device tree node references but fail to drop them on error paths, early exits.
Add the missing of_node_put() calls across PowerPC platform to ensure proper device node reference counting. These changes prevent device node reference leaks and improve overall resource management in PowerPC code. Suggested-by: Sourabh Jain <[email protected]> Signed-off-by: Jyoti Gupta <[email protected]> --- v2 -> v3: - powermac/pci.c: Dropped __maybe_unused from the ht declaration in pmac_pci_init(), as ht is now used on both PPC32 and PPC64. - kexec/file_load_64.c: Use "goto out" for the -EOVERFLOW case in add_usable_mem_property() so the common of_node_put() cleanup is used, instead of adding a separate of_node_put() before the return. - Link to v2 - https://lore.kernel.org/all/[email protected]/ v1 -> v2: - Rebased onto latest upstream. - Dropped the powermac/smp.c hunk: there is no leak there. The loop iterator drops cc on continue/advance and the existing code puts it before the break, so the added of_node_put() calls were a double put. - Added Suggested-by tag. - Link to v1 - https://lore.kernel.org/all/[email protected]/ --- arch/powerpc/kexec/file_load_64.c | 3 ++- arch/powerpc/platforms/44x/iss4xx.c | 2 ++ arch/powerpc/platforms/44x/warp.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_8259.c | 1 + arch/powerpc/platforms/86xx/pic.c | 1 + arch/powerpc/platforms/pasemi/setup.c | 1 + arch/powerpc/platforms/powermac/pci.c | 3 ++- arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 ++-- 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c index bd80c5fb1b1f..328554fe064e 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -204,7 +204,8 @@ static int add_usable_mem_property(void *fdt, struct device_node *dn, if (snprintf(path, NODE_PATH_LEN, "%pOF", dn) > (NODE_PATH_LEN - 1)) { pr_err("Buffer (%d) too small for memory node: %pOF\n", NODE_PATH_LEN, dn); - return -EOVERFLOW; + ret = -EOVERFLOW; + goto out; } kexec_dprintk("Memory node path: %s\n", path); diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c index ef883d97fe15..ef92b4656d17 100644 --- a/arch/powerpc/platforms/44x/iss4xx.c +++ b/arch/powerpc/platforms/44x/iss4xx.c @@ -74,6 +74,8 @@ static void __init iss4xx_init_irq(void) #endif } else panic("Unrecognized top level interrupt controller"); + + of_node_put(np); } #ifdef CONFIG_SMP diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c index 6f674f86dc85..49afd60b1c30 100644 --- a/arch/powerpc/platforms/44x/warp.c +++ b/arch/powerpc/platforms/44x/warp.c @@ -183,6 +183,7 @@ static int pika_setup_leds(void) printk(KERN_ERR __FILE__ ": Failed to get %s led gpio: %d\n", led->name, error); of_node_put(child); + of_node_put(np); goto err_cleanup_pins; } diff --git a/arch/powerpc/platforms/85xx/mpc85xx_8259.c b/arch/powerpc/platforms/85xx/mpc85xx_8259.c index cb00d596ad80..9b7283038892 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_8259.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_8259.c @@ -52,6 +52,7 @@ void __init mpc85xx_8259_init(void) cascade_irq = irq_of_parse_and_map(cascade_node, 0); if (!cascade_irq) { pr_err("i8259: Failed to map cascade interrupt\n"); + of_node_put(cascade_node); return; } diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c index 9ca36de23532..4cbcc16b1009 100644 --- a/arch/powerpc/platforms/86xx/pic.c +++ b/arch/powerpc/platforms/86xx/pic.c @@ -58,6 +58,7 @@ void __init mpc86xx_init_irq(void) cascade_irq = irq_of_parse_and_map(cascade_node, 0); if (!cascade_irq) { printk(KERN_ERR "Failed to map cascade interrupt\n"); + of_node_put(cascade_node); return; } diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 7a961f2a228f..a82855752e58 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c @@ -272,6 +272,7 @@ static __init void pas_init_IRQ(void) opprop = of_get_property(root, "platform-open-pic", &opplen); if (!opprop) { pr_err("No platform-open-pic property.\n"); + of_node_put(mpic_node); of_node_put(root); return; } diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index d71359b5331c..114def2e8043 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c @@ -903,7 +903,7 @@ static int pmac_pci_root_bridge_prepare(struct pci_host_bridge *bridge) void __init pmac_pci_init(void) { struct device_node *np, *root; - struct device_node *ht __maybe_unused = NULL; + struct device_node *ht = NULL; pci_set_flags(PCI_CAN_SKIP_ISA_ALIGN); @@ -938,6 +938,7 @@ void __init pmac_pci_init(void) /* pmac_check_ht_link(); */ #else /* CONFIG_PPC64 */ + of_node_put(ht); init_p2pbridge(); init_second_ohare(); fixup_nec_usb2(); diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index bc6926dbf148..c4f7348aa035 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -637,16 +637,16 @@ static unsigned int pseries_cpuhp_cache_use_count(const struct device_node *cach for_each_of_cpu_node(dn) { tn = of_find_next_cache_node(dn); - of_node_put(tn); if (tn == cachedn) use_count++; + of_node_put(tn); } for_each_node_by_type(dn, "cache") { tn = of_find_next_cache_node(dn); - of_node_put(tn); if (tn == cachedn) use_count++; + of_node_put(tn); } return use_count; -- 2.55.0
