linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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, linux-mips@vger.kernel.org,
	Xuefeng Li <lixuefeng@loongson.cn>
Subject: [PATCH v3 10/14 RESEND] irqchip/nvic: Fix potential resource leaks
Date: Wed, 24 Jun 2020 15:45:07 +0800	[thread overview]
Message-ID: <1592984711-3130-11-git-send-email-yangtiezhu@loongson.cn> (raw)
In-Reply-To: <1592984711-3130-1-git-send-email-yangtiezhu@loongson.cn>

There exists potential resource leaks in the error path, fix them.

Fixes: 292ec080491d ("irqchip: Add support for ARMv7-M NVIC")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
---
 drivers/irqchip/irq-nvic.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-nvic.c b/drivers/irqchip/irq-nvic.c
index f747e22..cd17f5d 100644
--- a/drivers/irqchip/irq-nvic.c
+++ b/drivers/irqchip/irq-nvic.c
@@ -94,7 +94,8 @@ static int __init nvic_of_init(struct device_node *node,
 
 	if (!nvic_irq_domain) {
 		pr_warn("Failed to allocate irq domain\n");
-		return -ENOMEM;
+		ret = -ENOMEM;
+		goto err_iounmap;
 	}
 
 	ret = irq_alloc_domain_generic_chips(nvic_irq_domain, 32, 1,
@@ -102,8 +103,7 @@ static int __init nvic_of_init(struct device_node *node,
 					     clr, 0, IRQ_GC_INIT_MASK_CACHE);
 	if (ret) {
 		pr_warn("Failed to allocate irq chips\n");
-		irq_domain_remove(nvic_irq_domain);
-		return ret;
+		goto err_domain_remove;
 	}
 
 	for (i = 0; i < numbanks; ++i) {
@@ -129,5 +129,11 @@ static int __init nvic_of_init(struct device_node *node,
 		writel_relaxed(0, nvic_base + NVIC_IPR + i);
 
 	return 0;
+
+err_domain_remove:
+	irq_domain_remove(nvic_irq_domain);
+err_iounmap:
+	iounmap(nvic_base);
+	return ret;
 }
 IRQCHIP_DECLARE(armv7m_nvic, "arm,armv7m-nvic", nvic_of_init);
-- 
2.1.0


  parent reply	other threads:[~2020-06-24  7:45 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-24  7:44 [PATCH v3 00/14 RESEND] irqchip: Fix potential resource leaks Tiezhu Yang
2020-06-24  7:44 ` [PATCH v3 01/14 RESEND] irqchip/ath79-misc: " Tiezhu Yang
2020-06-24  7:44 ` [PATCH v3 02/14 RESEND] irqchip/csky-apb-intc: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 03/14 RESEND] irqchip/csky-mpintc: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 04/14 RESEND] irqchip/davinci-aintc: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 05/14 RESEND] irqchip/davinci-cp-intc: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 06/14 RESEND] irqchip/digicolor: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 07/14 RESEND] irqchip/dw-apb-ictl: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 08/14 RESEND] irqchip/ls1x: " Tiezhu Yang
2020-06-24  7:45 ` [PATCH v3 09/14 RESEND] irqchip/mscc-ocelot: " Tiezhu Yang
2020-06-24  7:45 ` Tiezhu Yang [this message]
2020-06-24  7:45 ` [PATCH v3 11/14 RESEND] irqchip/omap-intc: Fix potential resource leak Tiezhu Yang
2020-06-24  8:30 ` [PATCH v3 00/14 RESEND] irqchip: Fix potential resource leaks Marc Zyngier
2020-06-24  9:02   ` Tiezhu Yang
2020-06-24 11:48     ` Tiezhu Yang
2020-06-24 11:52       ` Marc Zyngier
2020-06-28 11:25   ` Aleksandar Markovic
2020-06-28 12:06     ` Marc Zyngier
2020-06-28 12:48       ` Aleksandar Markovic
2020-06-28 16:55         ` Marc Zyngier
2020-06-28 17:00           ` Aleksandar Markovic

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=1592984711-3130-11-git-send-email-yangtiezhu@loongson.cn \
    --to=yangtiezhu@loongson.cn \
    --cc=jason@lakedaemon.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=lixuefeng@loongson.cn \
    --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).