[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200407111007.429362016@infradead.org>
Date: Tue, 07 Apr 2020 13:02:40 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: tglx@...utronix.de, linux-kernel@...r.kernel.org
Cc: hch@...radead.org, sean.j.christopherson@...el.com,
mingo@...hat.com, bp@...en8.de, hpa@...or.com, x86@...nel.org,
kenny@...ix.com, peterz@...radead.org, jeyu@...nel.org,
rasmus.villemoes@...vas.dk, pbonzini@...hat.com,
fenghua.yu@...el.com, xiaoyao.li@...el.com, nadav.amit@...il.com,
thellstrom@...are.com, tony.luck@...el.com, rostedt@...dmis.org,
gregkh@...uxfoundation.org, jannh@...gle.com,
keescook@...omium.org, David.Laight@...lab.com,
dcovelli@...are.com, mhiramat@...nel.org
Subject: [PATCH 4/4] x86,module: Detect CRn and DRn manipulation
Since we now have infrastructure to analyze module text, disallow
modules that write to CRn and DRn registers.
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
---
arch/x86/kernel/module.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -266,6 +266,22 @@ static bool insn_is_vmx(struct insn *ins
return false;
}
+static bool insn_is_mov_CRn(struct insn *insn)
+{
+ if (insn->opcode.bytes[0] == 0x0f && insn->opcode.bytes[1] == 0x22)
+ return true;
+
+ return false;
+}
+
+static bool insn_is_mov_DRn(struct insn *insn)
+{
+ if (insn->opcode.bytes[0] == 0x0f && insn->opcode.bytes[1] == 0x23)
+ return true;
+
+ return false;
+}
+
static int decode_module(struct module *mod, void *text, void *text_end, bool sld_safe)
{
bool allow_vmx = sld_safe || !split_lock_enabled();
@@ -285,6 +301,11 @@ static int decode_module(struct module *
return -ENOEXEC;
}
+ if (insn_is_mov_CRn(&insn) || insn_is_mov_DRn(&insn)) {
+ pr_err("Module writes to CRn or DRn, please use the proper accessors: %s\n", mod->name);
+ return -ENOEXEC;
+ }
+
text += insn.length;
}
Powered by blists - more mailing lists