forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "arm64: Stash shadow stack pointer in the task struct on interrupt"

Browse source 
This reverts commit 3f225f29c6 which is
commit 59b37fe52f upstream.

It breaks some test systems, so obviously the backport to 5.10.y wasn't
quite correct :(

Revert it for now until this can be figured out better.

Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1071c357225a8b41f15767a27b5c56cf94d7a5f7
This commit is contained in:
Greg Kroah-Hartman 2023-06-26 15:19:54 +00:00
commit 6229d57677
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/arm64/kernel/entry.S
View file

@ -530,7 +530,9 @@ SYM_CODE_END(__swpan_exit_el0)
.macro irq_stack_entry
mov x19, sp // preserve the original sp
scs_save tsk // preserve the original shadow stack
#ifdef CONFIG_SHADOW_CALL_STACK
mov x24, scs_sp // preserve the original shadow stack
#endif
/*
* Compare sp with the base of the task stack.
@ -564,7 +566,9 @@ SYM_CODE_END(__swpan_exit_el0)
*/
.macro irq_stack_exit
mov sp, x19
scs_load_current
#ifdef CONFIG_SHADOW_CALL_STACK
mov scs_sp, x24
#endif
.endm
/* GPRs used by entry code */