KVM: X86: Fix reserved bits check for MOV to CR3
authorWanpeng Li <wanpengli@tencent.com>
Sun, 13 May 2018 09:24:47 +0000 (02:24 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 14 May 2018 16:14:16 +0000 (18:14 +0200)
commita780a3ea628268b2ad0ed43d7f28d90db0ff18be
treea915ee042396777168e7cf4ec31746cd1b6428c0
parent64f7a11586ab9262f00b8b6eceef6d8154921bd8
KVM: X86: Fix reserved bits check for MOV to CR3

MSB of CR3 is a reserved bit if the PCIDE bit is not set in CR4.
It should be checked when PCIDE bit is not set, however commit
'd1cd3ce900441 ("KVM: MMU: check guest CR3 reserved bits based on
its physical address width")' removes the bit 63 checking
unconditionally. This patch fixes it by checking bit 63 of CR3
when PCIDE bit is not set in CR4.

Fixes: d1cd3ce900441 (KVM: MMU: check guest CR3 reserved bits based on its physical address width)
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Liran Alon <liran.alon@oracle.com>
Cc: stable@vger.kernel.org
Reviewed-by: Junaid Shahid <junaids@google.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/emulate.c
arch/x86/kvm/x86.c