KVM: VMX: Use is_64_bit_mode() to check 64-bit mode in SGX handler
authorBinbin Wu <binbin.wu@linux.intel.com>
Tue, 4 Apr 2023 03:25:02 +0000 (11:25 +0800)
committerSean Christopherson <seanjc@google.com>
Wed, 5 Apr 2023 18:52:19 +0000 (11:52 -0700)
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: 70210c044b4e ("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>
arch/x86/kvm/vmx/sgx.c

index aa53c98..0574030 100644 (file)
@@ -29,14 +29,14 @@ static int sgx_get_encls_gva(struct kvm_vcpu *vcpu, unsigned long offset,
 
        /* Skip vmcs.GUEST_DS retrieval for 64-bit mode to avoid VMREADs. */
        *gva = offset;
-       if (!is_long_mode(vcpu)) {
+       if (!is_64_bit_mode(vcpu)) {
                vmx_get_segment(vcpu, &s, VCPU_SREG_DS);
                *gva += s.base;
        }
 
        if (!IS_ALIGNED(*gva, alignment)) {
                fault = true;
-       } else if (likely(is_long_mode(vcpu))) {
+       } else if (likely(is_64_bit_mode(vcpu))) {
                fault = is_noncanonical_address(*gva, vcpu);
        } else {
                *gva &= 0xffffffff;