2015-11-11 16:24:30 +00:00
|
|
|
From 32d3dc2147823a32c8a7771d8fe0f2d1ef057c6a Mon Sep 17 00:00:00 2001
|
2015-09-01 22:03:08 +00:00
|
|
|
From: Josh Boyer <jwboyer@redhat.com>
|
|
|
|
|
Date: Mon, 25 Jun 2012 19:57:30 -0400
|
2015-11-11 16:24:30 +00:00
|
|
|
Subject: [PATCH 07/20] acpi: Ignore acpi_rsdp kernel parameter when module
|
|
|
|
|
loading is restricted
|
2015-09-01 22:03:08 +00:00
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
---
|
|
|
|
|
drivers/acpi/osl.c | 3 ++-
|
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
|
2015-11-11 16:24:30 +00:00
|
|
|
index 739a4a6b3b9b..9ef2a020a7a9 100644
|
2015-09-01 22:03:08 +00:00
|
|
|
--- a/drivers/acpi/osl.c
|
|
|
|
|
+++ b/drivers/acpi/osl.c
|
2015-11-11 16:24:30 +00:00
|
|
|
@@ -40,6 +40,7 @@
|
2015-09-01 22:03:08 +00:00
|
|
|
#include <linux/list.h>
|
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
|
#include <linux/semaphore.h>
|
|
|
|
|
+#include <linux/module.h>
|
|
|
|
|
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
|
#include <asm/uaccess.h>
|
2015-11-11 16:24:30 +00:00
|
|
|
@@ -253,7 +254,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
|
2015-09-01 22:03:08 +00:00
|
|
|
acpi_physical_address __init acpi_os_get_root_pointer(void)
|
|
|
|
|
{
|
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
|
- if (acpi_rsdp)
|
|
|
|
|
+ if (acpi_rsdp && !secure_modules())
|
|
|
|
|
return acpi_rsdp;
|
|
|
|
|
#endif
|
|
|
|
|
|
2015-11-11 16:24:30 +00:00
|
|
|
--
|
|
|
|
|
2.4.3
|
|
|
|
|
|
