From: Tiezhu Yang <yangtiezhu@loongson.cn>
To: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Marc Zyngier <maz@kernel.org>
Cc: linux-kernel@vger.kernel.org, Markus Elfring <Markus.Elfring@web.de>
Subject: [PATCH v5 04/14] irqchip/davinci-aintc: Fix potential resource leaks
Date: Mon, 6 Jul 2020 09:19:15 +0800 [thread overview]
Message-ID: <1593998365-25910-5-git-send-email-yangtiezhu@loongson.cn> (raw)
In-Reply-To: <1593998365-25910-1-git-send-email-yangtiezhu@loongson.cn>
In the function davinci_aintc_init(), system resources "config->reg.start",
"davinci_aintc_base", "irq_base" and "davinci_aintc_irq_domain" were not
released in a few error cases. Thus add jump targets for the completion of
the desired exception handling.
Fixes: 0145beed9d26 ("irqchip: davinci-aintc: move the driver to drivers/irqchip")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
drivers/irqchip/irq-davinci-aintc.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-davinci-aintc.c b/drivers/irqchip/irq-davinci-aintc.c
index 810ccc4..2a96dc9 100644
--- a/drivers/irqchip/irq-davinci-aintc.c
+++ b/drivers/irqchip/irq-davinci-aintc.c
@@ -96,7 +96,7 @@ void __init davinci_aintc_init(const struct davinci_aintc_config *config)
resource_size(&config->reg));
if (!davinci_aintc_base) {
pr_err("%s: unable to ioremap register range\n", __func__);
- return;
+ goto err_release;
}
/* Clear all interrupt requests */
@@ -133,7 +133,7 @@ void __init davinci_aintc_init(const struct davinci_aintc_config *config)
if (irq_base < 0) {
pr_err("%s: unable to allocate interrupt descriptors: %d\n",
__func__, irq_base);
- return;
+ goto err_iounmap;
}
davinci_aintc_irq_domain = irq_domain_add_legacy(NULL,
@@ -141,7 +141,7 @@ void __init davinci_aintc_init(const struct davinci_aintc_config *config)
&irq_domain_simple_ops, NULL);
if (!davinci_aintc_irq_domain) {
pr_err("%s: unable to create interrupt domain\n", __func__);
- return;
+ goto err_free_descs;
}
ret = irq_alloc_domain_generic_chips(davinci_aintc_irq_domain, 32, 1,
@@ -150,7 +150,7 @@ void __init davinci_aintc_init(const struct davinci_aintc_config *config)
if (ret) {
pr_err("%s: unable to allocate generic irq chips for domain\n",
__func__);
- return;
+ goto err_domain_remove;
}
for (irq_off = 0, reg_off = 0;
@@ -160,4 +160,14 @@ void __init davinci_aintc_init(const struct davinci_aintc_config *config)
irq_base + irq_off, 32);
set_handle_irq(davinci_aintc_handle_irq);
+ return;
+
+err_domain_remove:
+ irq_domain_remove(davinci_aintc_irq_domain);
+err_free_descs:
+ irq_free_descs(irq_base, config->num_irqs);
+err_iounmap:
+ iounmap(davinci_aintc_base);
+err_release:
+ release_mem_region(config->reg.start, resource_size(&config->reg));
}
--
2.1.0
next prev parent reply other threads:[~2020-07-06 1:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 1:19 [PATCH v5 00/14] irqchip: Fix potential resource leaks Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 01/14] irqchip/ath79-misc: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 02/14] irqchip/csky-apb-intc: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 03/14] irqchip/csky-mpintc: " Tiezhu Yang
2020-07-06 6:14 ` Markus Elfring
2020-07-06 1:19 ` Tiezhu Yang [this message]
2020-07-06 1:19 ` [PATCH v5 05/14] irqchip/davinci-cp-intc: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 06/14] irqchip/digicolor: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 07/14] irqchip/dw-apb-ictl: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 08/14] irqchip/ls1x: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 09/14] irqchip/mscc-ocelot: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 10/14] irqchip/nvic: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 11/14] irqchip/omap-intc: Fix potential resource leak Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 12/14] irqchip/riscv-intc: " Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 13/14] irqchip/s3c24xx: Fix potential resource leaks Tiezhu Yang
2020-07-06 1:19 ` [PATCH v5 14/14] irqchip/xilinx-intc: Fix potential resource leak Tiezhu Yang
2020-07-06 7:30 ` Markus Elfring
2020-07-06 7:30 ` [PATCH v5 00/14] irqchip: Fix potential resource leaks Marc Zyngier
2020-07-06 7:43 ` Markus Elfring
2020-09-02 3:59 ` Tiezhu Yang
2020-10-12 2:31 ` 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=1593998365-25910-5-git-send-email-yangtiezhu@loongson.cn \
--to=yangtiezhu@loongson.cn \
--cc=Markus.Elfring@web.de \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@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).