Don't overflow irq_desc array
PATCH 1/5 Don't overflow irq_desc array
Check the irq number is within bounds in the functions which weren't already checking.
Signed-off-by Matthew Wilcox <[email protected]>
Acked-by Ingo Molnar <[email protected]>
---
kernel/irq/manage.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
applies-to: bf816f7c7055127415fc3b718e260855df815d55 ef8b1f22644fd4b6b74c41bffc80f517d5d6ac72
kernel/irq/manage.c +15 -0
@@ -36,6 +36,9 @@ void synchronize_irq(unsigned int irq) {struct irq_desc *desc = irq_desc + irq; +if (irq >=NR_IRQS ) +return ; +while (desc->status &IRQ_INPROGRESS )cpu_relax (); }
@@ -60,6 +63,9 @@ void disable_irq_nosync(unsigned int irqirq_desc_t *desc = irq_desc + irq;unsigned long flags; +if (irq >=NR_IRQS ) +return ; +spin_lock_irqsave (&desc->lock, flags);if (!desc->depth++) { desc->status |=IRQ_DISABLED ;
@@ -86,6 +92,9 @@ void disable_irq(unsigned int irq) {irq_desc_t *desc = irq_desc + irq; +if (irq >=NR_IRQS ) +return ; +disable_irq_nosync (irq);if (desc->action)synchronize_irq (irq);
@@ -108,6 +117,9 @@ void enable_irq(unsigned int irq)irq_desc_t *desc = irq_desc + irq;unsigned long flags; +if (irq >=NR_IRQS ) +return ; +spin_lock_irqsave (&desc->lock, flags);switch (desc->depth) {case 0 :
@@ -163,6 +175,9 @@ int setup_irq(unsigned int irq, struct iunsigned long flags;int shared =0 ; +if (irq >=NR_IRQS ) +return -EINVAL ; +if (desc->handler == &no_irq_type)return -ENOSYS ;/*
---
0.99.8.GIT