UBUNTU: SAUCE: UEFI: acpi: Ignore acpi_rsdp kernel parameter when module loading...

This option allows userspace to pass the RSDP address to the kernel, which
makes it possible for a user to circumvent any restrictions imposed on
loading modules. Disable it in that case.

Signed-off-by: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 57fb5f468ac2025ecb80775d420bebc9a867b998..9174461f9dcb1258f702688ec9e0bb0410576459 100644 (file)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -40,6 +40,7 @@
 #include <linux/list.h>
 #include <linux/jiffies.h>
 #include <linux/semaphore.h>
+#include <linux/module.h>
 
 #include <asm/io.h>
 #include <linux/uaccess.h>
@@ -192,7 +193,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
        acpi_physical_address pa = 0;
 
 #ifdef CONFIG_KEXEC
-       if (acpi_rsdp)
+       if (acpi_rsdp && !secure_modules())
                return acpi_rsdp;
 #endif