2024-03-27 15:09:24

by Zenghui Yu

Subject: [PATCH] irqchip/alpine-msi: Fix off-by-one on allocation error path

When alpine_msix_gic_domain_alloc() returns an error, there is an
off-by-one in the number of IRQs to be freed.

Fix it by passing the number of successfully allocated IRQs, instead of the
relative index of the last allocated one.

Fixes: 3841245e8498 ("irqchip/alpine-msi: Fix freeing of interrupts on allocation error path")
Cc: Tsahee Zidenberg <[email protected]>
Cc: Antoine Tenart <[email protected]>
Signed-off-by: Zenghui Yu <[email protected]>
---
drivers/irqchip/irq-alpine-msi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c
index 9c8b1349ee17..a1430ab60a8a 100644
--- a/drivers/irqchip/irq-alpine-msi.c
+++ b/drivers/irqchip/irq-alpine-msi.c
@@ -165,7 +165,7 @@ static int alpine_msix_middle_domain_alloc(struct irq_domain *domain,
return 0;

err_sgi:
- irq_domain_free_irqs_parent(domain, virq, i - 1);
+ irq_domain_free_irqs_parent(domain, virq, i);
alpine_msix_free_sgi(priv, sgi, nr_irqs);
return err;
}
--
2.33.0

2024-04-09 09:08:30

by tip-bot2 for Alexey Makhalov

Subject: [tip: irq/core] irqchip/alpine-msi: Fix off-by-one in allocation error path

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

Commit-ID: ff3669a71afa06208de58d6bea1cc49d5e3fcbd1
Gitweb: https://git.kernel.org/tip/ff3669a71afa06208de58d6bea1cc49d5e3fcbd1
Author: Zenghui Yu <[email protected]>
AuthorDate: Wed, 27 Mar 2024 22:23:05 +08:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Tue, 09 Apr 2024 11:03:15 +02:00

irqchip/alpine-msi: Fix off-by-one in allocation error path

When alpine_msix_gic_domain_alloc() fails, there is an off-by-one in the
number of interrupts to be freed.

Fix it by passing the number of successfully allocated interrupts, instead
of the relative index of the last allocated one.

Fixes: 3841245e8498 ("irqchip/alpine-msi: Fix freeing of interrupts on allocation error path")
Signed-off-by: Zenghui Yu <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

---
drivers/irqchip/irq-alpine-msi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c
index 9c8b134..a1430ab 100644
--- a/drivers/irqchip/irq-alpine-msi.c
+++ b/drivers/irqchip/irq-alpine-msi.c
@@ -165,7 +165,7 @@ static int alpine_msix_middle_domain_alloc(struct irq_domain *domain,
return 0;

err_sgi:
- irq_domain_free_irqs_parent(domain, virq, i - 1);
+ irq_domain_free_irqs_parent(domain, virq, i);
alpine_msix_free_sgi(priv, sgi, nr_irqs);
return err;
}