]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
of/irq: Fix device node refcount leakage in API irq_of_parse_and_map()
authorZijun Hu <quic_zijuhu@quicinc.com>
Sun, 9 Feb 2025 12:58:59 +0000 (20:58 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2025 08:45:35 +0000 (10:45 +0200)
commit 962a2805e47b933876ba0e4c488d9e89ced2dd29 upstream.

In irq_of_parse_and_map(), refcount of device node @oirq.np was got
by successful of_irq_parse_one() invocation, but it does not put the
refcount before return, so causes @oirq.np refcount leakage.

Fix by putting @oirq.np refcount before return.

Fixes: e3873444990d ("of/irq: Move irq_of_parse_and_map() to common code")
Cc: stable@vger.kernel.org
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20250209-of_irq_fix-v2-6-93e3a2659aa7@quicinc.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/of/irq.c

index e264e395cbee6c0b3487b3560dee64c9f0f417d6..097795001f9e995a058056f124e3ee6d7d8dc40b 100644 (file)
 unsigned int irq_of_parse_and_map(struct device_node *dev, int index)
 {
        struct of_phandle_args oirq;
+       unsigned int ret;
 
        if (of_irq_parse_one(dev, index, &oirq))
                return 0;
 
-       return irq_create_of_mapping(&oirq);
+       ret = irq_create_of_mapping(&oirq);
+       of_node_put(oirq.np);
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(irq_of_parse_and_map);