KVM: x86: fix overlap between SPTE_MMIO_MASK and generation
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 18 Jan 2020 19:09:03 +0000 (20:09 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 23 Jan 2020 08:50:34 +0000 (09:50 +0100)
commit56871d444bc4d7ea66708775e62e2e0926384dbc
tree801e6a751937b26e8a7d051ad622f99cd2fd5ef5
parent09cbcef6c60e77af11c3f27e62ea3f291a5d436c
KVM: x86: fix overlap between SPTE_MMIO_MASK and generation

The SPTE_MMIO_MASK overlaps with the bits used to track MMIO
generation number.  A high enough generation number would overwrite the
SPTE_SPECIAL_MASK region and cause the MMIO SPTE to be misinterpreted.

Likewise, setting bits 52 and 53 would also cause an incorrect generation
number to be read from the PTE, though this was partially mitigated by the
(useless if it weren't for the bug) removal of SPTE_SPECIAL_MASK from
the spte in get_mmio_spte_generation.  Drop that removal, and replace
it with a compile-time assertion.

Fixes: 6eeb4ef049e7 ("KVM: x86: assign two bits to track SPTE kinds")
Reported-by: Ben Gardon <bgardon@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/mmu/mmu.c