patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / acpi / tables.c

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 621640e..d87764e 100644 (file)
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -343,10 +343,11 @@ acpi_table_parse_madt_family (
        entry = (acpi_table_entry_header *)
                ((unsigned long) madt + madt_size);
 
-       while (((unsigned long) entry) < madt_end) {
+       while (((unsigned long) entry) + sizeof(acpi_table_entry_header) < madt_end) {
                if (entry->type == entry_id &&
                    (!max_entries || count++ < max_entries))
-                       handler(entry);
+                       if (handler(entry, madt_end))
+                               return -EINVAL;
 
                entry = (acpi_table_entry_header *)
                        ((unsigned long) entry + entry->length);