KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs()
PATCH 1/1 KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs()
kvm_valid_sregs() should use X86_CR0_PG and X86_CR4_PAE to check bit status rather than X86_CR0_PG_BIT and X86_CR4_PAE_BIT. This patch is to fix it.
Fixes f29810335965a(KVM/x86: Check input paging mode when cs.l is set)
Reported-by Jeremi Piotrowski <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Radim Krčmář <[email protected]>
Signed-off-by Tianyu Lan <[email protected]>
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -7496,13 +7496,13 @@ EXPORT_SYMBOL_GPL(kvm_task_switch);int kvm_valid_sregs (struct kvm_vcpu *vcpu,struct kvm_sregs *sregs) { -if ((sregs->efer &EFER_LME ) && (sregs->cr0 &X86_CR0_PG_BIT )) { +if ((sregs->efer &EFER_LME ) && (sregs->cr0 &X86_CR0_PG )) {/* * When EFER.LME and CR0.PG are set, the processor is in * 64-bit mode (though maybe in a 32-bit code segment). * CR4.PAE and EFER.LMA must be set. */ -if (!(sregs->cr4 &X86_CR4_PAE_BIT ) +if (!(sregs->cr4 &X86_CR4_PAE ) || !(sregs->efer &EFER_LMA ))return -EINVAL ; }else {
Signature · 1 line
2.7.4