From: Tiezhu Yang <yangtiezhu@loongson.cn>
To: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <maz@kernel.org>, Rob Herring <robh+dt@kernel.org>
Cc: Huacai Chen <chenhc@lemote.com>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-mips@vger.kernel.org, Xuefeng Li <lixuefeng@loongson.cn>
Subject: [PATCH v3 03/14] irqchip/csky-mpintc: Fix potential resource leaks
Date: Wed, 24 Jun 2020 15:29:31 +0800 [thread overview]
Message-ID: <1592983782-8842-4-git-send-email-yangtiezhu@loongson.cn> (raw)
In-Reply-To: <1592983782-8842-1-git-send-email-yangtiezhu@loongson.cn>
There exists potential resource leaks in the error path, fix them.
Fixes: d8a5f5f79122 ("irqchip: add C-SKY SMP interrupt controller")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
drivers/irqchip/irq-csky-mpintc.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/drivers/irqchip/irq-csky-mpintc.c b/drivers/irqchip/irq-csky-mpintc.c
index a1534ed..c195e24 100644
--- a/drivers/irqchip/irq-csky-mpintc.c
+++ b/drivers/irqchip/irq-csky-mpintc.c
@@ -247,8 +247,10 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)
if (INTCG_base == NULL) {
INTCG_base = ioremap(mfcr("cr<31, 14>"),
INTCL_SIZE*nr_cpu_ids + INTCG_SIZE);
- if (INTCG_base == NULL)
- return -EIO;
+ if (INTCG_base == NULL) {
+ ret = -EIO;
+ goto err_free;
+ }
INTCL_base = INTCG_base + INTCG_SIZE;
@@ -257,8 +259,10 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)
root_domain = irq_domain_add_linear(node, nr_irq, &csky_irqdomain_ops,
NULL);
- if (!root_domain)
- return -ENXIO;
+ if (!root_domain) {
+ ret = -ENXIO;
+ goto err_iounmap;
+ }
/* for every cpu */
for_each_present_cpu(cpu) {
@@ -270,12 +274,22 @@ csky_mpintc_init(struct device_node *node, struct device_node *parent)
#ifdef CONFIG_SMP
ipi_irq = irq_create_mapping(root_domain, IPI_IRQ);
- if (!ipi_irq)
- return -EIO;
+ if (!ipi_irq) {
+ ret = -EIO;
+ goto err_domain_remove;
+ }
set_send_ipi(&csky_mpintc_send_ipi, ipi_irq);
#endif
return 0;
+
+err_domain_remove:
+ irq_domain_remove(root_domain);
+err_iounmap:
+ iounmap(INTCG_base);
+err_free:
+ kfree(__trigger);
+ return ret;
}
IRQCHIP_DECLARE(csky_mpintc, "csky,mpintc", csky_mpintc_init);
--
2.1.0
next prev parent reply other threads:[~2020-06-24 7:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 7:29 [PATCH v3 00/14] irqchip: Fix potential resource leaks Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 01/14] irqchip/ath79-misc: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 02/14] irqchip/csky-apb-intc: " Tiezhu Yang
2020-06-24 7:29 ` Tiezhu Yang [this message]
2020-06-24 7:29 ` [PATCH v3 04/14] irqchip/davinci-aintc: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 05/14] irqchip/davinci-cp-intc: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 06/14] irqchip/digicolor: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 07/14] irqchip/dw-apb-ictl: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 08/14] irqchip/ls1x: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 09/14] irqchip/mscc-ocelot: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 10/14] irqchip/nvic: " Tiezhu Yang
2020-06-24 7:29 ` [PATCH v3 11/14] irqchip/omap-intc: Fix potential resource leak Tiezhu Yang
2020-06-24 11:43 [PATCH v3 03/14] irqchip/csky-mpintc: Fix potential resource leaks Markus Elfring
2020-06-24 12:07 ` Tiezhu Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1592983782-8842-4-git-send-email-yangtiezhu@loongson.cn \
--to=yangtiezhu@loongson.cn \
--cc=chenhc@lemote.com \
--cc=devicetree@vger.kernel.org \
--cc=jason@lakedaemon.net \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=maz@kernel.org \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).