Commit 0d7d8449 authored by David Edmondson's avatar David Edmondson Committed by Paolo Bonzini
Browse files

KVM: x86: SGX must obey the KVM_INTERNAL_ERROR_EMULATION protocol 



When passing the failing address and size out to user space, SGX must
ensure not to trample on the earlier fields of the emulation_failure
sub-union of struct kvm_run.

Signed-off-by: default avatarDavid Edmondson <david.edmondson@oracle.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210920103737.2696756-5-david.edmondson@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e615e355

arch/x86/kvm/vmx/sgx.c

+5 −11
Original line number Diff line number Diff line
@@ -53,11 +53,9 @@ static int sgx_get_encls_gva(struct kvm_vcpu *vcpu, unsigned long offset, 
static void sgx_handle_emulation_failure(struct kvm_vcpu *vcpu, u64 addr,

					 unsigned int size)

{

	vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

	vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;

	vcpu->run->internal.ndata = 2;

	vcpu->run->internal.data[0] = addr;

	vcpu->run->internal.data[1] = size;

	uint64_t data[2] = { addr, size };



	__kvm_prepare_emulation_failure_exit(vcpu, data, ARRAY_SIZE(data));

}



static int sgx_read_hva(struct kvm_vcpu *vcpu, unsigned long hva, void *data,
@@ -112,9 +110,7 @@ static int sgx_inject_fault(struct kvm_vcpu *vcpu, gva_t gva, int trapnr) 
	 * but the error code isn't (yet) plumbed through the ENCLS helpers.

	 */

	if (trapnr == PF_VECTOR && !boot_cpu_has(X86_FEATURE_SGX2)) {

		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;

		vcpu->run->internal.ndata = 0;

		kvm_prepare_emulation_failure_exit(vcpu);

		return 0;

	}
@@ -155,9 +151,7 @@ static int __handle_encls_ecreate(struct kvm_vcpu *vcpu, 
	sgx_12_0 = kvm_find_cpuid_entry(vcpu, 0x12, 0);

	sgx_12_1 = kvm_find_cpuid_entry(vcpu, 0x12, 1);

	if (!sgx_12_0 || !sgx_12_1) {

		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;

		vcpu->run->internal.ndata = 0;

		kvm_prepare_emulation_failure_exit(vcpu);

		return 0;

	}