Skip to content

Commit 45d55e7

Browse files
committed
x86/apic/vector: Fix off by one in error path
Keith reported the following warning: WARNING: CPU: 28 PID: 1420 at kernel/irq/matrix.c:222 irq_matrix_remove_managed+0x10f/0x120 x86_vector_free_irqs+0xa1/0x180 x86_vector_alloc_irqs+0x1e4/0x3a0 msi_domain_alloc+0x62/0x130 The reason for this is that if the vector allocation fails the error handling code tries to free the failed vector as well, which causes the above imbalance warning to trigger. Adjust the error path to handle this correctly. Fixes: b5dc8e6 ("x86/irq: Use hierarchical irqdomain to manage CPU interrupt vectors") Reported-by: Keith Busch <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Keith Busch <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801161217300.1823@nanos
1 parent d479244 commit 45d55e7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

arch/x86/kernel/apic/vector.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,14 +542,17 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,
542542

543543
err = assign_irq_vector_policy(irqd, info);
544544
trace_vector_setup(virq + i, false, err);
545-
if (err)
545+
if (err) {
546+
irqd->chip_data = NULL;
547+
free_apic_chip_data(apicd);
546548
goto error;
549+
}
547550
}
548551

549552
return 0;
550553

551554
error:
552-
x86_vector_free_irqs(domain, virq, i + 1);
555+
x86_vector_free_irqs(domain, virq, i);
553556
return err;
554557
}
555558

0 commit comments

Comments
 (0)