[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4787a3c4-9713-4b99-9b8a-7ba227e91d02@sabinyo.mountain>
Date: Wed, 16 Jul 2025 14:38:22 -0500
From: Dan Carpenter <dan.carpenter@...aro.org>
To: Lorenzo Pieralisi <lpieralisi@...nel.org>
Cc: Marc Zyngier <maz@...nel.org>, Thomas Gleixner <tglx@...utronix.de>,
Timothy Hayes <timothy.hayes@....com>,
Sascha Bischoff <sascha.bischoff@....com>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH 3/3] irqchip/gic-v5: Fix error handling in
gicv5_its_irq_domain_alloc()
There are two issues to fix in this code:
1) If gicv5_alloc_lpi() fails the original code was checking the wrong
variable. Fix the mixup between "ret" and "lpi".
2) If irq_domain_alloc_irqs_parent() fails, then clean up all the loop
iterations instead of just the current iteration.
Fixes: 57d72196dfc8 ("irqchip/gic-v5: Add GICv5 ITS support")
Signed-off-by: Dan Carpenter <dan.carpenter@...aro.org>
---
drivers/irqchip/irq-gic-v5-its.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/irqchip/irq-gic-v5-its.c b/drivers/irqchip/irq-gic-v5-its.c
index 55360ae9f1f6..8cc8563e27d5 100644
--- a/drivers/irqchip/irq-gic-v5-its.c
+++ b/drivers/irqchip/irq-gic-v5-its.c
@@ -949,15 +949,18 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
device_id = its_dev->device_id;
for (i = 0; i < nr_irqs; i++) {
- lpi = gicv5_alloc_lpi();
+ ret = gicv5_alloc_lpi();
if (ret < 0) {
pr_debug("Failed to find free LPI!\n");
goto out_eventid;
}
+ lpi = ret;
ret = irq_domain_alloc_irqs_parent(domain, virq + i, 1, &lpi);
- if (ret)
+ if (ret) {
+ gicv5_free_lpi(lpi);
goto out_free_lpi;
+ }
/*
* Store eventid and deviceid into the hwirq for later use.
@@ -979,7 +982,12 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
return 0;
out_free_lpi:
- gicv5_free_lpi(lpi);
+ while (--i >= 0) {
+ irqd = irq_domain_get_irq_data(domain, virq + i);
+ gicv5_free_lpi(irqd->parent_data->hwirq);
+ irq_domain_reset_irq_data(irqd);
+ irq_domain_free_irqs_parent(domain, virq + i, 1);
+ }
out_eventid:
gicv5_its_free_eventid(its_dev, event_id_base, nr_irqs);
return ret;
--
2.47.2
Powered by blists - more mailing lists