]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
irqchip: Plug a OF node reference leak in platform_irqchip_probe()
authorJoe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Sun, 15 Dec 2024 03:39:45 +0000 (12:39 +0900)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 15 Jan 2025 09:38:43 +0000 (10:38 +0100)
platform_irqchip_probe() leaks a OF node when irq_init_cb() fails. Fix it
by declaring par_np with the __free(device_node) cleanup construct.

This bug was found by an experimental static analysis tool that I am
developing.

Fixes: f8410e626569 ("irqchip: Add IRQCHIP_PLATFORM_DRIVER_BEGIN/END and IRQCHIP_MATCH helper macros")
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/20241215033945.3414223-1-joe@pf.is.s.u-tokyo.ac.jp
drivers/irqchip/irqchip.c

index 1eeb0d0156ce9e840197ec3a4a83c51e0ee33ff5..0ee7b6b71f5fa5d0b4480d6a8ce9d7122b4701b0 100644 (file)
@@ -35,11 +35,10 @@ void __init irqchip_init(void)
 int platform_irqchip_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       struct device_node *par_np = of_irq_find_parent(np);
+       struct device_node *par_np __free(device_node) = of_irq_find_parent(np);
        of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev);
 
        if (!irq_init_cb) {
-               of_node_put(par_np);
                return -EINVAL;
        }
 
@@ -55,7 +54,6 @@ int platform_irqchip_probe(struct platform_device *pdev)
         * interrupt controller can check for specific domains as necessary.
         */
        if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) {
-               of_node_put(par_np);
                return -EPROBE_DEFER;
        }