]> err.no Git - linux-2.6/commitdiff
PNPACPI: ignore _PRS interrupt numbers larger than PNP_IRQ_NR
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Fri, 27 Jun 2008 22:57:12 +0000 (16:57 -0600)
committerAndi Kleen <andi@basil.nowhere.org>
Wed, 16 Jul 2008 21:27:07 +0000 (23:27 +0200)
ACPI Extended Interrupt Descriptors can encode 32-bit interrupt
numbers, so an interrupt number may exceed the size of the bitmap
we use to track possible IRQ settings.

To avoid corrupting memory, complain and ignore too-large interrupt
numbers.

There's similar code in pnpacpi_parse_irq_option(), but I didn't
change that because the small IRQ descriptor can only encode
IRQs 0-15, which do not exceed bitmap size.

In the future, we could handle IRQ numbers greater than PNP_IRQ_NR
by replacing the bitmap with a table or list.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/pnp/pnpacpi/rsparser.c

index 3aaf406b67b8663c1e3cd74d00a0a4a27d6ba234..851c773feae12097f8c362a1363fd52956ad0cd6 100644 (file)
@@ -455,9 +455,16 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
                return;
 
        bitmap_zero(map.bits, PNP_IRQ_NR);
-       for (i = 0; i < p->interrupt_count; i++)
-               if (p->interrupts[i])
-                       __set_bit(p->interrupts[i], map.bits);
+       for (i = 0; i < p->interrupt_count; i++) {
+               if (p->interrupts[i]) {
+                       if (p->interrupts[i] < PNP_IRQ_NR)
+                               __set_bit(p->interrupts[i], map.bits);
+                       else
+                               dev_err(&dev->dev, "ignoring IRQ %d option "
+                                       "(too large for %d entry bitmap)\n",
+                                       p->interrupts[i], PNP_IRQ_NR);
+               }
+       }
 
        flags = irq_flags(p->triggering, p->polarity, p->sharable);
        pnp_register_irq_resource(dev, option, &map, flags);