From 13dc325c42eec0d48705c51b79abbfdacd40f1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Piel?= <Eric.Piel@tremplin-utc.net>
Date: Tue, 5 Feb 2008 00:04:50 +0100
Subject: [PATCH] --- yaml --- r: 84179 b: refs/heads/master c:
 6ed31e92e94830c138fbd470486383380710069a h: refs/heads/master i:   84177:
 ec87520ae6fba416f5a5ac0f9822d133b5237998   84175:
 8b018175d81462c13fc5a639382bdbf86b63ddd4 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/acpi/osl.c     | 7 +++++++
 trunk/include/linux/kernel.h | 1 +
 trunk/kernel/panic.c         | 5 +++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 76a48ca25455..54b68e19fdd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71fc47a9adf8ee89e5c96a47222915c5485ac437
+refs/heads/master: 6ed31e92e94830c138fbd470486383380710069a
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 131936e7ff17..bbd8360bfb23 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -392,6 +392,13 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
 			*new_table = initrd_table;
 	}
 #endif
+	if (*new_table != NULL) {
+		printk(KERN_WARNING PREFIX "Override [%4.4s-%8.8s], "
+			   "this is unsafe: tainting kernel\n",
+		       existing_table->signature,
+		       existing_table->oem_table_id);
+		add_taint(TAINT_OVERRIDDEN_ACPI_TABLE);
+	}
 	return AE_OK;
 }
 
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 18222f267bc4..9e01f376840a 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -243,6 +243,7 @@ extern enum system_states {
 #define TAINT_BAD_PAGE			(1<<5)
 #define TAINT_USER			(1<<6)
 #define TAINT_DIE			(1<<7)
+#define TAINT_OVERRIDDEN_ACPI_TABLE	(1<<8)
 
 extern void dump_stack(void) __cold;
 
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index d9e90cfe3298..24af9f8bac99 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -161,7 +161,7 @@ const char *print_tainted(void)
 {
 	static char buf[20];
 	if (tainted) {
-		snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c%c%c%c",
+		snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c%c%c%c%c",
 			tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G',
 			tainted & TAINT_FORCED_MODULE ? 'F' : ' ',
 			tainted & TAINT_UNSAFE_SMP ? 'S' : ' ',
@@ -169,7 +169,8 @@ const char *print_tainted(void)
 			tainted & TAINT_MACHINE_CHECK ? 'M' : ' ',
 			tainted & TAINT_BAD_PAGE ? 'B' : ' ',
 			tainted & TAINT_USER ? 'U' : ' ',
-			tainted & TAINT_DIE ? 'D' : ' ');
+			tainted & TAINT_DIE ? 'D' : ' ',
+			tainted & TAINT_OVERRIDDEN_ACPI_TABLE ? 'A' : ' ');
 	}
 	else
 		snprintf(buf, sizeof(buf), "Not tainted");