github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "FROMLIST: arm64: efi: restore x18 if it was corrupted"

Browse Source 
Shadow call stack is now merged upstream for 5.9, so revert the patches
cherry-picked into android-mainline in preparation for pulling the upstream
version instead.

This reverts commit 0db85aae47.

Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I1ea401c18421641e334f06fb8249b463968087eb
This commit is contained in:
Will Deacon 2020-06-09 12:52:14 +01:00
parent 5e48418ca8
commit 861c24bf6c
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm64/kernel/efi-rt-wrapper.S
View File

@ -34,14 +34,5 @@ ENTRY(__efi_rt_asm_wrapper)
ldp x29, x30, [sp], #32
b.ne 0f
ret
0:
#ifdef CONFIG_SHADOW_CALL_STACK
/*
* Restore x18 before returning to instrumented code. This is
* safe because the wrapper is called with preemption disabled and
* a separate shadow stack is used for interrupts.
*/
mov x18, x2
#endif
b efi_handle_corrupted_x18 // tail call
0: b efi_handle_corrupted_x18 // tail call
ENDPROC(__efi_rt_asm_wrapper)