Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 325a8d36 authored by Thomas Renninger's avatar Thomas Renninger Committed by H. Peter Anvin
Browse files

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: default avatarThomas Renninger <trenn@suse.de>
Link: http://lkml.kernel.org/r/1349043837-22659-6-git-send-email-trenn@suse.de


Cc: Len Brown <lenb@kernel.org>
Cc: Robert Moore <robert.moore@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent b2a35003

drivers/acpi/osl.c

+13 −7
Original line number Diff line number Diff line
@@ -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

}