projects/linux·commit df6fd319

ACPI: relax BAD_MADT_ENTRY check to allow LSAPIC variable length string UIDs

df6fd319 · Starikovskiy, Alexey Y <[email protected]> · 2006-08-18 11:23:00 -04:00

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 <[email protected]>
Signed-off-by: Len Brown <[email protected]>
Commit
df6fd31995cb2e38b2a7e94bc8f1559b8f55404e
Parents
d68909f4

Changes

2 files changed · +2 −2

FileStatusAddDelContent
arch/i386/kernel/acpi/boot.cmodified+1−1View file
arch/ia64/kernel/acpi.cmodified+1−1View file

arch/i386/kernel/acpi/boot.c

View file
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 0db6387..ee003bc 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: "

arch/ia64/kernel/acpi.c

View file
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 99761b8..0176556 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: "