From: Alexandre Chartre <alexandre.chartre@oracle.com>
To: "tglx@linutronix.de"@aserv0121.oracle.com,
"mingo@redhat.com"@aserv0121.oracle.com,
"bp@alien8.de"@aserv0121.oracle.com,
"hpa@zytor.com"@aserv0121.oracle.com,
"x86@kernel.org"@aserv0121.oracle.com,
"dave.hansen@linux.intel.com"@aserv0121.oracle.com,
"luto@kernel.org"@aserv0121.oracle.com,
"peterz@infradead.org"@aserv0121.oracle.com,
"linux-kernel@vger.kernel.org"@aserv0121.oracle.com,
"thomas.lendacky@amd.com"@aserv0121.oracle.com,
"jroedel@suse.de"@aserv0121.oracle.com
Cc: "konrad.wilk@oracle.com"@aserv0121.oracle.com,
"jan.setjeeilers@oracle.com"@aserv0121.oracle.com,
"junaids@google.com"@aserv0121.oracle.com,
"oweisse@google.com"@aserv0121.oracle.com,
"rppt@linux.vnet.ibm.com"@aserv0121.oracle.com,
"graf@amazon.de"@aserv0121.oracle.com,
"mgross@linux.intel.com"@aserv0121.oracle.com,
"kuzuno@gmail.com"@aserv0121.oracle.com,
"alexandre.chartre@oracle.com"@aserv0121.oracle.com
Subject: [RFC][PATCH 15/24] x86/pti: Execute syscall functions on the kernel stack
Date: Mon, 9 Nov 2020 12:23:10 +0100 [thread overview]
Message-ID: <20201109112319.264511-16-alexandre.chartre@oracle.com> (raw)
In-Reply-To: <20201109112319.264511-1-alexandre.chartre@oracle.com>
During a syscall, the kernel is entered and it switches the stack
to the PTI stack which is mapped both in the kernel and in the
user page-table. When executing the syscall function, switch to
the kernel stack (which is mapped only in the kernel page-table)
so that no kernel data leak to the userland through the stack.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
arch/x86/entry/common.c | 11 ++++++++++-
arch/x86/entry/entry_64.S | 1 +
arch/x86/include/asm/irq_stack.h | 3 +++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 54d0931801e1..ead6a4c72e6a 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -56,10 +56,19 @@ __visible noinstr void return_from_fork(struct pt_regs *regs,
static __always_inline void run_syscall(sys_call_ptr_t sysfunc,
struct pt_regs *regs)
{
+ unsigned long stack;
+
if (!sysfunc)
return;
- regs->ax = sysfunc(regs);
+ if (!pti_enabled()) {
+ regs->ax = sysfunc(regs);
+ return;
+ }
+
+ stack = (unsigned long)task_top_of_kernel_stack(current);
+ regs->ax = asm_call_syscall_on_stack((void *)(stack - 8),
+ sysfunc, regs);
}
#ifdef CONFIG_X86_64
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 29beab46bedd..6b88a0eb8975 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -771,6 +771,7 @@ SYM_FUNC_START(asm_call_on_stack_2)
SYM_FUNC_START(asm_call_on_stack_3)
SYM_INNER_LABEL(asm_call_sysvec_on_stack, SYM_L_GLOBAL)
SYM_INNER_LABEL(asm_call_irq_on_stack, SYM_L_GLOBAL)
+SYM_INNER_LABEL(asm_call_syscall_on_stack, SYM_L_GLOBAL)
/*
* Save the frame pointer unconditionally. This allows the ORC
* unwinder to handle the stack switch.
diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_stack.h
index 359427216336..108d9da7c01c 100644
--- a/arch/x86/include/asm/irq_stack.h
+++ b/arch/x86/include/asm/irq_stack.h
@@ -5,6 +5,7 @@
#include <linux/ptrace.h>
#include <asm/processor.h>
+#include <asm/syscall.h>
#ifdef CONFIG_X86_64
static __always_inline bool irqstack_active(void)
@@ -25,6 +26,8 @@ void asm_call_sysvec_on_stack(void *sp, void (*func)(struct pt_regs *regs),
struct pt_regs *regs);
void asm_call_irq_on_stack(void *sp, void (*func)(struct irq_desc *desc),
struct irq_desc *desc);
+long asm_call_syscall_on_stack(void *sp, sys_call_ptr_t func,
+ struct pt_regs *regs);
static __always_inline void __run_on_irqstack(void (*func)(void))
{
--
2.18.4
next prev parent reply other threads:[~2020-11-09 11:24 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 11:22 [RFC][PATCH 00/24] x86/pti: Defer CR3 switch to C code Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 01/24] x86/syscall: Add wrapper for invoking syscall function Alexandre Chartre
2020-11-09 17:25 ` Andy Lutomirski
2020-11-09 17:45 ` Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 02/24] x86/entry: Update asm_call_on_stack to support more function arguments Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 03/24] x86/entry: Consolidate IST entry from userspace Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 04/24] x86/sev-es: Define a setup stack function for the VC idtentry Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 05/24] x86/entry: Implement ret_from_fork body with C code Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 06/24] x86/pti: Provide C variants of PTI switch CR3 macros Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 07/24] x86/entry: Fill ESPFIX stack using C code Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 08/24] x86/entry: Add C version of SWAPGS and SWAPGS_UNSAFE_STACK Alexandre Chartre
2020-11-09 17:38 ` Andy Lutomirski
2020-11-09 18:04 ` Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 09/24] x86/entry: Add C version of paranoid_entry/exit Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 10/24] x86/pti: Introduce per-task PTI trampoline stack Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 11/24] x86/pti: Function to clone page-table entries from a specified mm Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 12/24] x86/pti: Function to map per-cpu page-table entry Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 13/24] x86/pti: Extend PTI user mappings Alexandre Chartre
2020-11-09 17:28 ` Andy Lutomirski
2020-11-09 17:52 ` Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 14/24] x86/pti: Use PTI stack instead of trampoline stack Alexandre Chartre
2020-11-09 11:23 ` Alexandre Chartre [this message]
2020-11-09 11:23 ` [RFC][PATCH 16/24] x86/pti: Execute IDT handlers on the kernel stack Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 17/24] x86/pti: Execute IDT handlers with error code " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 18/24] x86/pti: Execute system vector handlers " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 19/24] x86/pti: Execute page fault handler " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 20/24] x86/pti: Execute NMI " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 21/24] x86/entry: Disable stack-protector for IST entry C handlers Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 22/24] x86/entry: Defer paranoid entry/exit to C code Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 23/24] x86/entry: Remove paranoid_entry and paranoid_exit Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 24/24] x86/pti: Defer CR3 switch to C code for non-IST and syscall entries Alexandre Chartre
2020-11-09 14:00 ` [RFC][PATCH 00/24] x86/pti: Defer CR3 switch to C code Alexandre Chartre
2020-11-09 14:44 Alexandre Chartre
2020-11-09 14:44 ` [RFC][PATCH 15/24] x86/pti: Execute syscall functions on the kernel stack Alexandre Chartre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201109112319.264511-16-alexandre.chartre@oracle.com \
--to=alexandre.chartre@oracle.com \
--cc="alexandre.chartre@oracle.com"@aserv0121.oracle.com \
--cc="bp@alien8.de"@aserv0121.oracle.com \
--cc="dave.hansen@linux.intel.com"@aserv0121.oracle.com \
--cc="graf@amazon.de"@aserv0121.oracle.com \
--cc="hpa@zytor.com"@aserv0121.oracle.com \
--cc="jan.setjeeilers@oracle.com"@aserv0121.oracle.com \
--cc="jroedel@suse.de"@aserv0121.oracle.com \
--cc="junaids@google.com"@aserv0121.oracle.com \
--cc="konrad.wilk@oracle.com"@aserv0121.oracle.com \
--cc="kuzuno@gmail.com"@aserv0121.oracle.com \
--cc="linux-kernel@vger.kernel.org"@aserv0121.oracle.com \
--cc="luto@kernel.org"@aserv0121.oracle.com \
--cc="mgross@linux.intel.com"@aserv0121.oracle.com \
--cc="mingo@redhat.com"@aserv0121.oracle.com \
--cc="oweisse@google.com"@aserv0121.oracle.com \
--cc="peterz@infradead.org"@aserv0121.oracle.com \
--cc="rppt@linux.vnet.ibm.com"@aserv0121.oracle.com \
--cc="tglx@linutronix.de"@aserv0121.oracle.com \
--cc="thomas.lendacky@amd.com"@aserv0121.oracle.com \
--cc="x86@kernel.org"@aserv0121.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).