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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Feb 2020 12:35:53 +0000 (04:35 -0800)
commit1d6cfa003c210f48ec9657296229927caec00c4c
treebd79622759ac14cbdb4d6ce2dc822bc8a2d483fd
parent8a1cd01bee30bd1033a452035f66be127728d4fd
KVM: x86: fix overlap between SPTE_MMIO_MASK and generation

[ Upstream commit 56871d444bc4d7ea66708775e62e2e0926384dbc ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/mmu.c