linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
	will.deacon@arm.com
Cc: dave.martin@arm.com, hch@infradead.org, james.morse@arm.com,
	linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org,
	marc.zyngier@arm.com, mark.rutland@arm.com,
	viro@zeniv.linux.org.uk
Subject: [PATCHv3 12/19] arm64: zero GPRs upon entry from EL0
Date: Mon, 18 Jun 2018 13:03:03 +0100	[thread overview]
Message-ID: <20180618120310.39527-13-mark.rutland@arm.com> (raw)
In-Reply-To: <20180618120310.39527-1-mark.rutland@arm.com>

We can zero GPRs x0 - x29 upon entry from EL0 to make it harder for
userspace to control values consumed by speculative gadgets.

We don't blat x30, since this is stashed much later, and we'll blat it
before invoking C code.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/kernel/entry.S | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 22c58e7dfc0f..39440c2ee66d 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -63,6 +63,12 @@
 #endif
 	.endm
 
+	.macro	clear_gp_regs
+	.irp	n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29
+	mov	x\n, xzr
+	.endr
+	.endm
+
 /*
  * Bad Abort numbers
  *-----------------
@@ -179,6 +185,7 @@ skip_apply_ssbd\@:
 	stp	x28, x29, [sp, #16 * 14]
 
 	.if	\el == 0
+	clear_gp_regs
 	mrs	x21, sp_el0
 	ldr_this_cpu	tsk, __entry_task, x20	// Ensure MDSCR_EL1.SS is clear,
 	ldr	x19, [tsk, #TSK_TI_FLAGS]	// since we can unmask debug
@@ -186,7 +193,6 @@ skip_apply_ssbd\@:
 
 	apply_ssbd 1, x22, x23
 
-	mov	x29, xzr			// fp pointed to user-space
 	.else
 	add	x21, sp, #S_FRAME_SIZE
 	get_thread_info tsk
-- 
2.11.0

  parent reply	other threads:[~2018-06-18 12:04 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-18 12:02 [PATCHv3 00/19] arm64: invoke syscalls with pt_regs Mark Rutland
2018-06-18 12:02 ` [PATCHv3 01/19] arm64: consistently use unsigned long for thread flags Mark Rutland
2018-06-19 10:49   ` Catalin Marinas
2018-06-19 11:19     ` Mark Rutland
2018-06-18 12:02 ` [PATCHv3 02/19] arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> Mark Rutland
2018-06-19 11:02   ` [PATCHv3 02/19] arm64: move SCTLR_EL{1, 2} " Catalin Marinas
2018-06-19 11:48   ` [PATCHv3 02/19] arm64: move SCTLR_EL{1,2} " Mark Rutland
2018-06-18 12:02 ` [PATCHv3 03/19] arm64: introduce sysreg_clear_set() Mark Rutland
2018-06-19 11:44   ` Catalin Marinas
2018-06-19 11:47   ` Marc Zyngier
2018-06-18 12:02 ` [PATCHv3 04/19] arm64: kill config_sctlr_el1() Mark Rutland
2018-06-19 11:44   ` Catalin Marinas
2018-06-18 12:02 ` [PATCHv3 05/19] arm64: kill change_cpacr() Mark Rutland
2018-06-19 11:45   ` Catalin Marinas
2018-06-18 12:02 ` [PATCHv3 06/19] arm64: move sve_user_{enable,disable} to <asm/fpsimd.h> Mark Rutland
2018-06-19 12:00   ` [PATCHv3 06/19] arm64: move sve_user_{enable, disable} " Catalin Marinas
2018-06-19 12:19   ` Dave Martin
2018-06-18 12:02 ` [PATCHv3 07/19] arm64: remove sigreturn wrappers Mark Rutland
2018-06-19 12:47   ` Catalin Marinas
2018-06-18 12:02 ` [PATCHv3 08/19] arm64: convert raw syscall invocation to C Mark Rutland
2018-06-19 13:33   ` Catalin Marinas
2018-06-19 14:21   ` Catalin Marinas
2018-06-19 14:48     ` Mark Rutland
2018-06-19 14:55       ` Catalin Marinas
2018-06-19 14:58         ` Mark Rutland
2018-06-18 12:03 ` [PATCHv3 09/19] arm64: convert syscall trace logic " Mark Rutland
2018-06-19 14:32   ` Catalin Marinas
2018-06-19 15:14     ` Mark Rutland
2018-06-18 12:03 ` [PATCHv3 10/19] arm64: convert native/compat syscall entry " Mark Rutland
2018-06-19 12:18   ` Dave Martin
2018-06-19 13:15     ` Mark Rutland
2018-06-20  9:21       ` Dave Martin
2018-06-19 15:20   ` Catalin Marinas
2018-06-18 12:03 ` [PATCHv3 11/19] arm64: don't reload GPRs after apply_ssbd Mark Rutland
2018-06-19 15:23   ` Catalin Marinas
2018-06-18 12:03 ` Mark Rutland [this message]
2018-06-19 15:24   ` [PATCHv3 12/19] arm64: zero GPRs upon entry from EL0 Catalin Marinas
2018-06-18 12:03 ` [PATCHv3 13/19] kernel: add ksys_personality() Mark Rutland
2018-06-19 15:45   ` Catalin Marinas
2018-06-19 15:53     ` Mark Rutland
2018-06-18 12:03 ` [PATCHv3 14/19] kernel: add kcompat_sys_{f,}statfs64() Mark Rutland
2018-06-18 12:03 ` [PATCHv3 15/19] arm64: remove in-kernel call to sys_personality() Mark Rutland
2018-06-19 15:46   ` Catalin Marinas
2018-06-18 12:03 ` [PATCHv3 16/19] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn Mark Rutland
2018-06-19 15:48   ` Catalin Marinas
2018-06-18 12:03 ` [PATCHv3 17/19] arm64: use SYSCALL_DEFINE6() for mmap Mark Rutland
2018-06-19 15:50   ` Catalin Marinas
2018-06-18 12:03 ` [PATCHv3 18/19] arm64: convert compat wrappers to C Mark Rutland
2018-06-19 15:51   ` Catalin Marinas
2018-06-18 12:03 ` [PATCHv3 19/19] arm64: implement syscall wrappers Mark Rutland
2018-06-19 16:13   ` Catalin Marinas
2018-06-19 15:38 ` [PATCHv3 00/19] arm64: invoke syscalls with pt_regs Mark Rutland
2018-06-19 16:14   ` Catalin Marinas

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=20180618120310.39527-13-mark.rutland@arm.com \
    --to=mark.rutland@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=dave.martin@arm.com \
    --cc=hch@infradead.org \
    --cc=james.morse@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux@dominikbrodowski.net \
    --cc=marc.zyngier@arm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=will.deacon@arm.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).