Commit e1251465 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras

[POWERPC] Fix loop logic in irq_alloc_virt()

There's a bug in irq_alloc_virt() if it's asked for more than 1 interrupt,
if it can't find a slot it might look past the end of the irq_map.
To be clear: the bug is that the continue affects the inner for loop,
not the outer one, so i becomes j + 1 and then we continue the inner
loop without checking if i is still <= limit.

This fixes it. No one in the kernel actually calls this with count >
1, so it's not critical.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 94983cb7
...@@ -777,7 +777,6 @@ unsigned int irq_alloc_virt(struct irq_host *host, ...@@ -777,7 +777,6 @@ unsigned int irq_alloc_virt(struct irq_host *host,
{ {
unsigned long flags; unsigned long flags;
unsigned int i, j, found = NO_IRQ; unsigned int i, j, found = NO_IRQ;
unsigned int limit = irq_virq_count - count;
if (count == 0 || count > (irq_virq_count - NUM_ISA_INTERRUPTS)) if (count == 0 || count > (irq_virq_count - NUM_ISA_INTERRUPTS))
return NO_IRQ; return NO_IRQ;
...@@ -794,14 +793,16 @@ unsigned int irq_alloc_virt(struct irq_host *host, ...@@ -794,14 +793,16 @@ unsigned int irq_alloc_virt(struct irq_host *host,
/* Look for count consecutive numbers in the allocatable /* Look for count consecutive numbers in the allocatable
* (non-legacy) space * (non-legacy) space
*/ */
for (i = NUM_ISA_INTERRUPTS; i <= limit; ) { for (i = NUM_ISA_INTERRUPTS, j = 0; i < irq_virq_count; i++) {
for (j = i; j < (i + count); j++) if (irq_map[i].host != NULL)
if (irq_map[j].host != NULL) { j = 0;
i = j + 1; else
continue; j++;
}
found = i; if (j == count) {
break; found = i - count + 1;
break;
}
} }
if (found == NO_IRQ) { if (found == NO_IRQ) {
spin_unlock_irqrestore(&irq_big_lock, flags); spin_unlock_irqrestore(&irq_big_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment