Commit d9f89b88 authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini

KVM: x86: Fix CR3 reserved bits check in long mode

Regression of 346874c9: PAE is set in long mode, but that does not mean
we have valid PDPTRs.
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 87c00572
...@@ -701,10 +701,11 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3) ...@@ -701,10 +701,11 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
return 0; return 0;
} }
if (is_long_mode(vcpu) && (cr3 & CR3_L_MODE_RESERVED_BITS)) if (is_long_mode(vcpu)) {
return 1; if (cr3 & CR3_L_MODE_RESERVED_BITS)
if (is_pae(vcpu) && is_paging(vcpu) && return 1;
!load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3)) } else if (is_pae(vcpu) && is_paging(vcpu) &&
!load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))
return 1; return 1;
vcpu->arch.cr3 = cr3; vcpu->arch.cr3 = cr3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment