---

yaml --- r: 131748 b: refs/heads/master c: 084eb96 h: refs/heads/master v: v3
git-mirror · Feb 14, 2009 · 9f0d0bd · 9f0d0bd
1 parent 2515bb9
commit 9f0d0bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 704126ad81b8cb7d3d70adb9ecb143f4d3fb38af
+refs/heads/master: 084eb960e81505680a9963665722d1bfd94af6a7
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -330,6 +330,14 @@ parse_dmar_table(void)
 	entry_header = (struct acpi_dmar_header *)(dmar + 1);
 	while (((unsigned long)entry_header) <
 			(((unsigned long)dmar) + dmar_tbl->length)) {
+		/* Avoid looping forever on bad ACPI tables */
+		if (entry_header->length == 0) {
+			printk(KERN_WARNING PREFIX
+				"Invalid 0-length structure\n");
+			ret = -EINVAL;
+			break;
+		}
+
 		dmar_table_print_dmar_entry(entry_header);
 
 		switch (entry_header->type) {