linux-kernel - [tip: irq/urgent] irqchip/riscv-intc: Prevent memory leak when riscv_intc_init

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <171741098562.10875.13157753436022438155.tip-bot2@tip-bot2>
Date: Mon, 03 Jun 2024 10:36:25 -0000
From: "tip-bot2 for Sunil V L" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Sunil V L <sunilvl@...tanamicro.com>, Thomas Gleixner <tglx@...utronix.de>,
 Anup Patel <anup@...infault.org>, stable@...r.kernel.org, x86@...nel.org,
 linux-kernel@...r.kernel.org, maz@...nel.org
Subject: [tip: irq/urgent] irqchip/riscv-intc: Prevent memory leak when
 riscv_intc_init_common() fails

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     0110c4b110477bb1f19b0d02361846be7ab08300
Gitweb:        https://git.kernel.org/tip/0110c4b110477bb1f19b0d02361846be7ab08300
Author:        Sunil V L <sunilvl@...tanamicro.com>
AuthorDate:    Mon, 27 May 2024 13:41:13 +05:30
Committer:     Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Mon, 03 Jun 2024 12:29:35 +02:00

irqchip/riscv-intc: Prevent memory leak when riscv_intc_init_common() fails

When riscv_intc_init_common() fails, the firmware node allocated is not
freed. Add the missing free().

Fixes: 7023b9d83f03 ("irqchip/riscv-intc: Add ACPI support")
Signed-off-by: Sunil V L <sunilvl@...tanamicro.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Anup Patel <anup@...infault.org>
Cc: stable@...r.kernel.org
Link: https://lore.kernel.org/r/20240527081113.616189-1-sunilvl@ventanamicro.com

---
 drivers/irqchip/irq-riscv-intc.c |  9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c
index 9e71c44..4f3a123 100644
--- a/drivers/irqchip/irq-riscv-intc.c
+++ b/drivers/irqchip/irq-riscv-intc.c
@@ -253,8 +253,9 @@ IRQCHIP_DECLARE(andes, "andestech,cpu-intc", riscv_intc_init);
 static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header,
 				       const unsigned long end)
 {
-	struct fwnode_handle *fn;
 	struct acpi_madt_rintc *rintc;
+	struct fwnode_handle *fn;
+	int rc;
 
 	rintc = (struct acpi_madt_rintc *)header;
 
@@ -273,7 +274,11 @@ static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header,
 		return -ENOMEM;
 	}
 
-	return riscv_intc_init_common(fn, &riscv_intc_chip);
+	rc = riscv_intc_init_common(fn, &riscv_intc_chip);
+	if (rc)
+		irq_domain_free_fwnode(fn);
+
+	return rc;
 }
 
 IRQCHIP_ACPI_DECLARE(riscv_intc, ACPI_MADT_TYPE_RINTC, NULL,