Skip to content

Commit 548bd27

Browse files
Binbin Wusean-jc
authored andcommitted
KVM: VMX: Use is_64_bit_mode() to check 64-bit mode in SGX handler
sgx_get_encls_gva() uses is_long_mode() to check 64-bit mode, however, SGX system leaf instructions are valid in compatibility mode, should use is_64_bit_mode() instead. Fixes: 70210c0 ("KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions") Signed-off-by: Binbin Wu <binbin.wu@linux.intel.com> Reviewed-by: Kai Huang <kai.huang@intel.com> Link: https://lore.kernel.org/r/20230404032502.27798-1-binbin.wu@linux.intel.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent f6cde92 commit 548bd27

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kvm/vmx/sgx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ static int sgx_get_encls_gva(struct kvm_vcpu *vcpu, unsigned long offset,
2929

3030
/* Skip vmcs.GUEST_DS retrieval for 64-bit mode to avoid VMREADs. */
3131
*gva = offset;
32-
if (!is_long_mode(vcpu)) {
32+
if (!is_64_bit_mode(vcpu)) {
3333
vmx_get_segment(vcpu, &s, VCPU_SREG_DS);
3434
*gva += s.base;
3535
}
3636

3737
if (!IS_ALIGNED(*gva, alignment)) {
3838
fault = true;
39-
} else if (likely(is_long_mode(vcpu))) {
39+
} else if (likely(is_64_bit_mode(vcpu))) {
4040
fault = is_noncanonical_address(*gva, vcpu);
4141
} else {
4242
*gva &= 0xffffffff;

0 commit comments

Comments
 (0)