Re: [PATCH V40 16/29] acpi: Disable ACPI table override if the kernel is locked down

From
Rafael J. Wysocki <hidden>
Date
2019-08-20 22:08:56
Also in
linux-acpi, linux-security-module, lkml
Reply to
Matthew Garrett, 2019-08-20
On Tuesday, August 20, 2019 2:17:52 AM CEST Matthew Garrett wrote:
From: Linn Crosetto <redacted>
quoted
From the kernel documentation (initrd_table_override.txt):
  If the ACPI_INITRD_TABLE_OVERRIDE compile option is true, it is possible
  to override nearly any ACPI table provided by the BIOS with an
  instrumented, modified one.

When lockdown is enabled, the kernel should disallow any unauthenticated
changes to kernel space.  ACPI tables contain code invoked by the kernel,
so do not allow ACPI tables to be overridden if the kernel is locked down.

Signed-off-by: Linn Crosetto <redacted>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Matthew Garrett <redacted>
Reviewed-by: Kees Cook <redacted>
cc: <redacted>
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Rafael J. Wysocki <redacted>
quoted hunk ↗ jump to hunk
---
 drivers/acpi/tables.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index de974322a197..b7c29a11c0c1 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -20,6 +20,7 @@
 #include <linux/memblock.h>
 #include <linux/earlycpio.h>
 #include <linux/initrd.h>
+#include <linux/security.h>
 #include "internal.h"
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT
@@ -577,6 +578,11 @@ void __init acpi_table_upgrade(void)
 	if (table_nr == 0)
 		return;
 
+	if (security_locked_down(LOCKDOWN_ACPI_TABLES)) {
+		pr_notice("kernel is locked down, ignoring table override\n");
+		return;
+	}
+
 	acpi_tables_addr =
 		memblock_find_in_range(0, ACPI_TABLE_UPGRADE_MAX_PHYS,
 				       all_tables_size, PAGE_SIZE);
Thread (52 messages) 52 messages, 11 authors, last reply 2022-01-05
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help