Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 09:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(security): optimisations for CVE-2022-23960" into integration

Browse source
This commit is contained in:
Lauren Wehrmeister 2022-10-27 00:00:11 +02:00 • committed by TrustedFirmware Code Review
commit 52a79b0ed7
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/arch/aarch64/asm_macros.S
View file

@ -214,6 +214,19 @@
ret
.endm
/*
* Macro for using speculation barrier instruction introduced by
* FEAT_SB, if it's enabled.
*/
.macro speculation_barrier
#if ENABLE_FEAT_SB
sb
#else
dsb sy
isb
#endif
.endm
/*
* Macro for mitigating against speculative execution beyond ERET. Uses the
* speculation barrier instruction introduced by FEAT_SB, if it's enabled.

9
lib/cpus/aarch64/wa_cve_2022_23960_bhb.S
View file

@ -9,11 +9,11 @@
#if WORKAROUND_CVE_2022_23960
/*
* This macro applies the mitigation for CVE-2022-23960.
* The macro saves x2-x3 to the CPU context.
* The macro saves x2 to the CPU context.
* SP should point to the CPU context.
*/
.macro apply_cve_2022_23960_bhb_wa _bhb_loop_count
stp x2, x3, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X2]
str x2, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X2]
/* CVE-BHB-NUM loop count */
mov x2, \_bhb_loop_count
@ -24,8 +24,7 @@
2:
subs x2, x2, #1
bne 1b
dsb sy
isb
ldp x2, x3, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X2]
speculation_barrier
ldr x2, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X2]
.endm
#endif /* WORKAROUND_CVE_2022_23960 */