path: root/virt
diff options
authorMarc Zyngier <maz@kernel.org>2021-01-21 12:08:15 +0000
committerMarc Zyngier <maz@kernel.org>2021-01-21 14:17:36 +0000
commit139bc8a6146d92822c866cf2fd410159c56b3648 (patch)
tree47749e54b37ecdf138090403959ecd93c73a8ae6 /virt
parent9529aaa056edc76b3a41df616c71117ebe11e049 (diff)
KVM: Forbid the use of tagged userspace addresses for memslots
The use of a tagged address could be pretty confusing for the whole memslot infrastructure as well as the MMU notifiers. Forbid it altogether, as it never quite worked the first place. Cc: stable@vger.kernel.org Reported-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'virt')
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 2541a17ff1c4..a9abaf5f8e53 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1290,6 +1290,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
return -EINVAL;
/* We can read the guest memory with __xxx_user() later on. */
if ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
+ (mem->userspace_addr != untagged_addr(mem->userspace_addr)) ||
!access_ok((void __user *)(unsigned long)mem->userspace_addr,
return -EINVAL;

Privacy Policy