[PATCH AUTOSEL for 4.9 219/281] KVM: nVMX: Update vmcs12->guest_linear_address on nested VM-exit

[Sasha Levin]

From: Jim Mattson <jmatt...@google.com>

[ 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: 119a9c01a5922 ("KVM: nVMX: pass valid guest linear-address to the L1")
Signed-off-by: Jim Mattson <jmatt...@google.com>
Signed-off-by: Radim Krčmář <rkrc...@redhat.com>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
---
 arch/x86/kvm/vmx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index df7bf580c899..b46ab8886c45 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -10657,8 +10657,7 @@ 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);
+       vmcs12->guest_linear_address = vmcs_readl(GUEST_LINEAR_ADDRESS);
 
        if (nested_cpu_has_vid(vmcs12))
                vmcs12->guest_intr_status = vmcs_read16(GUEST_INTR_STATUS);
-- 
2.14.1