x86/tdx: Zero out the missing RSI in TDX_HYPERCALL macro
[ Upstream commit 5d092b66119d774853cc9308522620299048a662 ] In the TDX_HYPERCALL asm, after the TDCALL instruction returns from the untrusted VMM, the registers that the TDX guest shares to the VMM need to be cleared to avoid speculative execution of VMM-provided values. RSI is specified in the bitmap of those registers, but it is missing when zeroing out those registers in the current TDX_HYPERCALL. It was there when it was originally added in commit752d13305c
("x86/tdx: Expand __tdx_hypercall() to handle more arguments"), but was later removed in commit1e70c68037
("x86/tdx: Do not corrupt frame-pointer in __tdx_hypercall()"), which was correct because %rsi is later restored in the "pop %rsi". However a later commit7a3a401874
("x86/tdx: Drop flags from __tdx_hypercall()") removed that "pop %rsi" but forgot to add the "xor %rsi, %rsi" back. Fix by adding it back. Fixes:7a3a401874
("x86/tdx: Drop flags from __tdx_hypercall()") Signed-off-by: Kai Huang <kai.huang@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/all/e7d1157074a0b45d34564d5f17f3e0ffee8115e9.1692096753.git.kai.huang%40intel.com Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
96312a251d
commit
de4c5bacca
|
@ -195,6 +195,7 @@ SYM_FUNC_END(__tdx_module_call)
|
|||
xor %r10d, %r10d
|
||||
xor %r11d, %r11d
|
||||
xor %rdi, %rdi
|
||||
xor %rsi, %rsi
|
||||
xor %rdx, %rdx
|
||||
|
||||
/* Restore callee-saved GPRs as mandated by the x86_64 ABI */
|
||||
|
|
Loading…
Reference in New Issue