xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 9134b5a464 ("arm64: Always load shadow stack pointer directly from the task struct") into android12-5.10-lts

Browse Source 
Steps on the way to 5.10.180

Change-Id: Ic2b3ad3de8e6177fda3a6ef1798bf7f289137fd6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-06-26 13:14:47 +00:00
parent 4a2ed7d4bc 9134b5a464
commit d9baf420d0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm64/include/asm/scs.h
View File

@@ -9,15 +9,16 @@
#ifdef CONFIG_SHADOW_CALL_STACK #ifdef CONFIG_SHADOW_CALL_STACK
scs_sp .req x18 scs_sp .req x18
.macro scs_load tsk, tmp .macro scs_load_current
ldr scs_sp, [\tsk, #TSK_TI_SCS_SP] get_current_task scs_sp
ldr scs_sp, [scs_sp, #TSK_TI_SCS_SP]
.endm .endm
.macro scs_save tsk, tmp .macro scs_save tsk, tmp
str scs_sp, [\tsk, #TSK_TI_SCS_SP] str scs_sp, [\tsk, #TSK_TI_SCS_SP]
.endm .endm
#else #else
.macro scs_load tsk, tmp .macro scs_load_current
.endm .endm
.macro scs_save tsk, tmp .macro scs_save tsk, tmp

4
arch/arm64/kernel/entry.S
View File

@@ -297,7 +297,7 @@ alternative_if ARM64_HAS_ADDRESS_AUTH
alternative_else_nop_endif alternative_else_nop_endif
1: 1:
scs_load tsk, x20 scs_load_current
.else .else
add x21, sp, #S_FRAME_SIZE add x21, sp, #S_FRAME_SIZE
get_current_task tsk get_current_task tsk
@@ -1122,7 +1122,7 @@ SYM_FUNC_START(cpu_switch_to)
msr sp_el0, x1 msr sp_el0, x1
ptrauth_keys_install_kernel x1, x8, x9, x10 ptrauth_keys_install_kernel x1, x8, x9, x10
scs_save x0, x8 scs_save x0, x8
scs_load x1, x8 scs_load_current
ret ret
SYM_FUNC_END(cpu_switch_to) SYM_FUNC_END(cpu_switch_to)
NOKPROBE(cpu_switch_to) NOKPROBE(cpu_switch_to)

2
arch/arm64/kernel/head.S
View File

@@ -621,7 +621,7 @@ SYM_FUNC_START_LOCAL(__secondary_switched)
ldr x2, [x0, #CPU_BOOT_TASK] ldr x2, [x0, #CPU_BOOT_TASK]
cbz x2, __secondary_too_slow cbz x2, __secondary_too_slow
msr sp_el0, x2 msr sp_el0, x2
scs_load x2, x3 scs_load_current
mov x29, #0 mov x29, #0
mov x30, #0 mov x30, #0