Commit 1928ac07 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Ding Hui
Browse files

arm64: efi: Restore register x18 if it was corrupted

mainline inclusion
from mainline-v5.8-rc1
commit e73f02c6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I67RIP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e73f02c6eb15729164b9dd5e19214b54446823ab



--------------------------------

If we detect a corrupted x18, restore the register before jumping back
to potentially SCS instrumented code. This is safe, because the wrapper
is called with preemption disabled and a separate shadow stack is used
for interrupt handling.

Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarDing Hui <dinghui@sangfor.com.cn>
parent 3a3a00dc
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment