Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

irqchip/renesas-rza1: Fix an use-after-free in rza1_irqc_probe()

Browse Source 
The gic_node is still being used in the rza1_irqc_parse_map() call
after the of_node_put() call, which may result in use-after-free.

Fixes: a644ccb819 ("irqchip: Add Renesas RZ/A1 Interrupt Controller driver")
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Marc Zyngier <maz@kernel.org>
This commit is contained in:
Wen Yang 2019-07-08 14:19:04 +08:00 committed by Marc Zyngier
parent 9a446ef08f
commit b5fa9fc9e8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/irqchip/irq-renesas-rza1.c
View File

@ -208,20 +208,19 @@ static int rza1_irqc_probe(struct platform_device *pdev)
return PTR_ERR(priv->base); return PTR_ERR(priv->base);
gic_node = of_irq_find_parent(np); gic_node = of_irq_find_parent(np);
if (gic_node) { if (gic_node)
parent = irq_find_host(gic_node); parent = irq_find_host(gic_node);
of_node_put(gic_node);
}
if (!parent) { if (!parent) {
dev_err(dev, "cannot find parent domain\n"); dev_err(dev, "cannot find parent domain\n");
return -ENODEV; ret = -ENODEV;
goto out_put_node;
} }
ret = rza1_irqc_parse_map(priv, gic_node); ret = rza1_irqc_parse_map(priv, gic_node);
if (ret) { if (ret) {
dev_err(dev, "cannot parse %s: %d\n", "interrupt-map", ret); dev_err(dev, "cannot parse %s: %d\n", "interrupt-map", ret);
return ret; goto out_put_node;
} }
priv->chip.name = "rza1-irqc", priv->chip.name = "rza1-irqc",
@ -237,10 +236,12 @@ static int rza1_irqc_probe(struct platform_device *pdev)
priv); priv);
if (!priv->irq_domain) { if (!priv->irq_domain) {
dev_err(dev, "cannot initialize irq domain\n"); dev_err(dev, "cannot initialize irq domain\n");
return -ENOMEM; ret = -ENOMEM;
} }
return 0; out_put_node:
of_node_put(gic_node);
return ret;
} }
static int rza1_irqc_remove(struct platform_device *pdev) static int rza1_irqc_remove(struct platform_device *pdev)