summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel/bpi.S
diff options
context:
space:
mode:
authorShanker Donthineni <shankerd@codeaurora.org>2018-01-05 14:28:59 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-16 20:22:54 +0100
commit9b26a45c34e40575e53287365be7571b9cda21ab (patch)
tree63085b5843ca9881b6cb627498da706a7f72a2e2 /arch/arm64/kernel/bpi.S
parent48993dfa1af8c719576a18c0e2ca1d611297e34e (diff)
arm64: Implement branch predictor hardening for Falkor
Commit ec82b567a74f upstream. Falkor is susceptible to branch predictor aliasing and can theoretically be attacked by malicious code. This patch implements a mitigation for these attacks, preventing any malicious entries from affecting other victim contexts. Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org> [will: fix label name when !CONFIG_KVM and remove references to MIDR_FALKOR] Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/kernel/bpi.S')
-rw-r--r--arch/arm64/kernel/bpi.S8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/kernel/bpi.S b/arch/arm64/kernel/bpi.S
index dec95bd82e31..76225c2611ea 100644
--- a/arch/arm64/kernel/bpi.S
+++ b/arch/arm64/kernel/bpi.S
@@ -77,3 +77,11 @@ ENTRY(__psci_hyp_bp_inval_start)
ldp x0, x1, [sp, #(16 * 8)]
add sp, sp, #(8 * 18)
ENTRY(__psci_hyp_bp_inval_end)
+
+ENTRY(__qcom_hyp_sanitize_link_stack_start)
+ stp x29, x30, [sp, #-16]!
+ .rept 16
+ bl . + 4
+ .endr
+ ldp x29, x30, [sp], #16
+ENTRY(__qcom_hyp_sanitize_link_stack_end)