Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4933e9f2 authored by Jim Mattson's avatar Jim Mattson Committed by Greg Kroah-Hartman
Browse files

KVM: nVMX: Update vmcs12->guest_linear_address on nested VM-exit 




[ Upstream commit d281e13b0bfe745a21061a194e386a949784393f ]

The guest-linear address field is set for VM exits due to attempts to
execute LMSW with a memory operand and VM exits due to attempts to
execute INS or OUTS for which the relevant segment is usable,
regardless of whether or not EPT is in use.

Fixes: 119a9c01 ("KVM: nVMX: pass valid guest linear-address to the L1")
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4aae4388

arch/x86/kvm/vmx.c

+1 −2
Original line number Diff line number Diff line
@@ -10664,7 +10664,6 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
		vmcs12->guest_pdptr3 = vmcs_read64(GUEST_PDPTR3);

	}



	if (nested_cpu_has_ept(vmcs12))

	vmcs12->guest_linear_address = vmcs_readl(GUEST_LINEAR_ADDRESS);



	if (nested_cpu_has_vid(vmcs12))