[PATCH] Check the irq number is within bounds

Most of the functions already check. Do the ones that didn't.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 15 insertions, 0 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 3bd7226d15fa..81c49a4d679e 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -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 irq)
         irq_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 irqaction * new)
         unsigned long flags;
         int shared = 0;
 
+        if (irq >= NR_IRQS)
+                return -EINVAL;
+
         if (desc->handler == &no_irq_type)
                 return -ENOSYS;
         /*