]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
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)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 5 Sep 2018 08:30:45 +0000 (10:30 +0200)
commitc7df6072d836ecafe3ed28300a0b3383edcf484a
treeac81c6052127853c680cfd91ae67abcbebe4644d
parent022fcdfd59d854a5bcf526da75e5aeb74f3fd8dc
KVM: X86: Fix reserved bits check for MOV to CR3

BugLink: http://bugs.launchpad.net/bugs/1790188
commit a780a3ea628268b2ad0ed43d7f28d90db0ff18be upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
arch/x86/kvm/emulate.c
arch/x86/kvm/x86.c