kvm: mmu: Don't read PDPTEs when paging is not enabled
PATCH 1/1 kvm: mmu: Don't read PDPTEs when paging is not enabled
From: Junaid Shahid <[email protected]>
Upstream commit d35b34a9a70edae7ef923f100e51b8b5ae9fe899.
kvm should not attempt to read guest PDPTEs when CR0.PG = 0 and CR4.PAE = 1.
Signed-off-by Junaid Shahid <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
Signed-off-by Sean Christopherson <[email protected]>
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -587,7 +587,7 @@ static bool pdptrs_changed(struct kvm_vcpu *vcpu)gfn_t gfn;int r; -if (is_long_mode (vcpu) || !is_pae (vcpu)) +if (is_long_mode (vcpu) || !is_pae (vcpu) || !is_paging (vcpu))return false; if (!test_bit(VCPU_EXREG_PDPTR,
@@ -7491,7 +7491,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,kvm_update_cpuid (vcpu); idx =srcu_read_lock (&vcpu->kvm->srcu); -if (!is_long_mode (vcpu) &&is_pae (vcpu)) { +if (!is_long_mode (vcpu) &&is_pae (vcpu) &&is_paging (vcpu)) {load_pdptrs (vcpu, vcpu->arch.walk_mmu,kvm_read_cr3 (vcpu)); mmu_reset_needed =1 ; }
Signature · 1 line
2.24.0
Quoted 10 lines · Sean Christopherson
From: Junaid Shahid <[email protected]>
Upstream commit
d35b34a9a70edae7ef923f100e51b8b5ae9fe899.kvm should not attempt to read guest PDPTEs when CR0.PG = 0 and CR4.PAE = 1.
Signed-off-by Junaid Shahid <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Queued up for 4.9, thank you.
Signature · 2 lines
Thanks, Sasha