aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-07-08 21:28:06 +0200
committerThomas Gleixner <tglx@linutronix.de>2020-07-09 11:18:29 +0200
commit006e1ced516d2bfd9db63a32b5dba3c2abf43b04 (patch)
treeaf48b2029b9b065d25f8afcca4079bb392883d2d /arch/x86
parentx86/traps: Disable interrupts in exc_aligment_check() (diff)
downloadlinux-dev-006e1ced516d2bfd9db63a32b5dba3c2abf43b04.tar.xz
linux-dev-006e1ced516d2bfd9db63a32b5dba3c2abf43b04.zip
x86/entry: Mark check_user_regs() noinstr
It's called from the non-instrumentable section. Fixes: c9c26150e61d ("x86/entry: Assert that syscalls are on the right stack") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Andy Lutomirski <luto@kernel.org> Link: https://lkml.kernel.org/r/20200708192934.191497962@linutronix.de
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/entry/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index e83b3f14897c..ea7b515e3bc2 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -46,7 +46,7 @@
#include <trace/events/syscalls.h>
/* Check that the stack and regs on entry from user mode are sane. */
-static void check_user_regs(struct pt_regs *regs)
+static noinstr void check_user_regs(struct pt_regs *regs)
{
if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) {
/*