summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-11-29 13:55:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:51:25 +0100
commit849270acd7b64d6e6b9fd848a9fcb5c86a4f5482 (patch)
tree84a5c800721ae5765c4073fddb535cdb7dc34613
parentaca4d1bd7e19f59652156dd4f3f1b79deab816d9 (diff)
downloadlinux-849270acd7b64d6e6b9fd848a9fcb5c86a4f5482.tar.gz
linux-849270acd7b64d6e6b9fd848a9fcb5c86a4f5482.tar.bz2
linux-849270acd7b64d6e6b9fd848a9fcb5c86a4f5482.zip
irqchip/alpine-msi: Fix freeing of interrupts on allocation error path
[ Upstream commit 3841245e8498a789c65dedd7ffa8fb2fee2c0684 ] The alpine-msi driver has an interesting allocation error handling, where it frees the same interrupts repeatedly. Hilarity follows. This code is probably never executed, but let's fix it nonetheless. Fixes: e6b78f2c3e14 ("irqchip: Add the Alpine MSIX interrupt controller") Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Antoine Tenart <atenart@kernel.org> Cc: Tsahee Zidenberg <tsahee@annapurnalabs.com> Cc: Antoine Tenart <atenart@kernel.org> Link: https://lore.kernel.org/r/20201129135525.396671-1-maz@kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/irqchip/irq-alpine-msi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c
index 23a3b877f7f1..ede02dc2bcd0 100644
--- a/drivers/irqchip/irq-alpine-msi.c
+++ b/drivers/irqchip/irq-alpine-msi.c
@@ -165,8 +165,7 @@ static int alpine_msix_middle_domain_alloc(struct irq_domain *domain,
return 0;
err_sgi:
- while (--i >= 0)
- irq_domain_free_irqs_parent(domain, virq, i);
+ irq_domain_free_irqs_parent(domain, virq, i - 1);
alpine_msix_free_sgi(priv, sgi, nr_irqs);
return err;
}