Commit-ID: 325a8d36035f0623950e38e9cf7a47a48e72df11 Gitweb: http://git.kernel.org/tip/325a8d36035f0623950e38e9cf7a47a48e72df11 Author: Thomas Renninger <tr...@suse.de> AuthorDate: Mon, 1 Oct 2012 00:23:56 +0200 Committer: H. Peter Anvin <h...@linux.intel.com> CommitDate: Sun, 30 Sep 2012 18:03:35 -0700
ACPI: Create acpi_table_taint() function to avoid code duplication There are two ways of overriding ACPI tables now, both need to taint the the kernel. Signed-off-by: Thomas Renninger <tr...@suse.de> Link: http://lkml.kernel.org/r/1349043837-22659-6-git-send-email-tr...@suse.de Cc: Len Brown <l...@kernel.org> Cc: Robert Moore <robert.mo...@intel.com> Cc: Yinghai Lu <ying...@kernel.org> Cc: Eric Piel <eric.p...@tremplin-utc.net> Signed-off-by: H. Peter Anvin <h...@linux.intel.com> --- drivers/acpi/osl.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 007224b..a2845ff 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -656,6 +656,15 @@ void __init acpi_initrd_override(void *data, size_t size) } #endif /* CONFIG_ACPI_INITRD_TABLE_OVERRIDE */ +static void acpi_table_taint(struct acpi_table_header *table) +{ + pr_warn(PREFIX + "Override [%4.4s-%8.8s], this is unsafe: tainting kernel\n", + table->signature, table->oem_table_id); + add_taint(TAINT_OVERRIDDEN_ACPI_TABLE); +} + + acpi_status acpi_os_table_override(struct acpi_table_header * existing_table, struct acpi_table_header ** new_table) @@ -669,13 +678,8 @@ acpi_os_table_override(struct acpi_table_header * existing_table, if (strncmp(existing_table->signature, "DSDT", 4) == 0) *new_table = (struct acpi_table_header *)AmlCode; #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); - } + if (*new_table != NULL) + acpi_table_taint(existing_table); return AE_OK; } @@ -736,6 +740,8 @@ acpi_os_physical_table_override(struct acpi_table_header *existing_table, break; } while (table_offset + ACPI_HEADER_SIZE < all_tables_size); + if (*address != 0) + acpi_table_taint(existing_table); return AE_OK; #endif } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
