Skip to content

Commit

Permalink
[PATCH] Check the irq number is within bounds
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Wilcox authored and Linus Torvalds committed Nov 23, 2005
1 parent 2d0ebb3 commit c2b5a25
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -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;
Expand All @@ -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);
Expand All @@ -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:
Expand Down Expand Up @@ -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;
/*
Expand Down

0 comments on commit c2b5a25

Please sign in to comment.