From 39b5dd3afa153ecb29099af03b8fd33d242f216d Mon Sep 17 00:00:00 2001 From: Jinjie Ruan Date: Sat, 4 Jan 2025 17:30:29 +0800 Subject: [PATCH] genirq/msi: Fix off-by-one error in msi_domain_alloc() mainline inclusion from mainline-v6.12-rc6 commit 5f994f534120f47432092fb36f5cb0c7a80ed2bf category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IBFOBV Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5f994f534120f47432092fb36f5cb0c7a80ed2bf -------------------------------- The error path in msi_domain_alloc(), frees the already allocated MSI interrupts in a loop, but the loop condition terminates when the index reaches zero, which fails to free the first allocated MSI interrupt at index zero. Check for >= 0 so that msi[0] is freed as well. Fixes: f3cf8bb0d6c3 ("genirq: Add generic msi irq domain support") Signed-off-by: Jinjie Ruan Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20241026063639.10711-1-ruanjinjie@huawei.com Signed-off-by: Lin Yujun --- kernel/irq/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 79b4a58ba9c3..5a4717a82024 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -702,7 +702,7 @@ static int msi_domain_alloc(struct irq_domain *domain, unsigned int virq, ret = ops->msi_init(domain, info, virq + i, hwirq + i, arg); if (ret < 0) { if (ops->msi_free) { - for (i--; i > 0; i--) + for (i--; i >= 0; i--) ops->msi_free(domain, info, virq + i); } irq_domain_free_irqs_top(domain, virq, nr_irqs); -- Gitee