diff options
| author | Starikovskiy, Alexey Y <alexey.y.starikovskiy@intel.com> | 2006-08-18 17:23:00 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-08-18 18:56:50 +0200 |
| commit | df6fd31995cb2e38b2a7e94bc8f1559b8f55404e (patch) | |
| tree | b6e14215a9a9757d6f149c75b5543a31c0f6766e /arch | |
| parent | ACPI: avoid irqrouter_resume might_sleep oops on resume from S4 (diff) | |
| download | linux-df6fd31995cb2e38b2a7e94bc8f1559b8f55404e.tar.xz linux-df6fd31995cb2e38b2a7e94bc8f1559b8f55404e.zip | |
ACPI: relax BAD_MADT_ENTRY check to allow LSAPIC variable length string UIDs
ACPI 3.0 appended a variable length UID string to the LAPIC structure
as part of support for > 256 processors. So the BAD_MADT_ENTRY() sanity
check can no longer compare for equality with a fixed structure length.
Signed-off-by: Alexey Y Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 0db6387025ca..ee003bc0e8b1 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -59,7 +59,7 @@ static inline int gsi_irq_sharing(int gsi) { return gsi; } #define BAD_MADT_ENTRY(entry, end) ( \ (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ - ((acpi_table_entry_header *)entry)->length != sizeof(*entry)) + ((acpi_table_entry_header *)entry)->length < sizeof(*entry)) #define PREFIX "ACPI: " diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 99761b81db44..0176556aeecc 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -55,7 +55,7 @@ #define BAD_MADT_ENTRY(entry, end) ( \ (!entry) || (unsigned long)entry + sizeof(*entry) > end || \ - ((acpi_table_entry_header *)entry)->length != sizeof(*entry)) + ((acpi_table_entry_header *)entry)->length < sizeof(*entry)) #define PREFIX "ACPI: " |