54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
|
From: Matthew Garrett <matthew.garrett@nebula.com>
|
||
|
|
Date: Fri, 9 Mar 2012 08:46:50 -0500
|
||
|
|
Subject: [PATCH] asus-wmi: Restrict debugfs interface when module loading is
|
||
|
|
restricted
|
||
|
|
|
||
|
|
We have no way of validating what all of the Asus WMI methods do on a
|
||
|
|
given machine, and there's a risk that some will allow hardware state to
|
||
|
|
be manipulated in such a way that arbitrary code can be executed in the
|
||
|
|
kernel, circumventing module loading restrictions. Prevent that if any of
|
||
|
|
these features are enabled.
|
||
|
|
|
||
|
|
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
|
||
|
|
---
|
||
|
|
drivers/platform/x86/asus-wmi.c | 9 +++++++++
|
||
|
|
1 file changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
|
||
|
|
index 21fc932da3a1..c6d42ad95c08 100644
|
||
|
|
--- a/drivers/platform/x86/asus-wmi.c
|
||
|
|
+++ b/drivers/platform/x86/asus-wmi.c
|
||
|
|
@@ -1590,6 +1590,9 @@ static int show_dsts(struct seq_file *m, void *data)
|
||
|
|
int err;
|
||
|
|
u32 retval = -1;
|
||
|
|
|
||
|
|
+ if (secure_modules())
|
||
|
|
+ return -EPERM;
|
||
|
|
+
|
||
|
|
err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
|
||
|
|
|
||
|
|
if (err < 0)
|
||
|
|
@@ -1606,6 +1609,9 @@ static int show_devs(struct seq_file *m, void *data)
|
||
|
|
int err;
|
||
|
|
u32 retval = -1;
|
||
|
|
|
||
|
|
+ if (secure_modules())
|
||
|
|
+ return -EPERM;
|
||
|
|
+
|
||
|
|
err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
|
||
|
|
&retval);
|
||
|
|
|
||
|
|
@@ -1630,6 +1636,9 @@ static int show_call(struct seq_file *m, void *data)
|
||
|
|
union acpi_object *obj;
|
||
|
|
acpi_status status;
|
||
|
|
|
||
|
|
+ if (secure_modules())
|
||
|
|
+ return -EPERM;
|
||
|
|
+
|
||
|
|
status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
|
||
|
|
1, asus->debug.method_id,
|
||
|
|
&input, &output);
|
||
|
|
--
|
||
|
|
1.9.3
|
||
|
|
|