[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <159428657046.4006.8686721076754110176.tip-bot2@tip-bot2>
Date: Thu, 09 Jul 2020 09:22:50 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>,
Andy Lutomirski <luto@...nel.org>, x86 <x86@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [tip: x86/urgent] x86/entry: Mark check_user_regs() noinstr
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 006e1ced516d2bfd9db63a32b5dba3c2abf43b04
Gitweb: https://git.kernel.org/tip/006e1ced516d2bfd9db63a32b5dba3c2abf43b04
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 08 Jul 2020 21:28:06 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Thu, 09 Jul 2020 11:18:29 +02:00
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@...utronix.de>
Acked-by: Andy Lutomirski <luto@...nel.org>
Link: https://lkml.kernel.org/r/20200708192934.191497962@linutronix.de
---
arch/x86/entry/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index e83b3f1..ea7b515 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)) {
/*
Powered by blists - more mailing lists