Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78749809 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Avi Kivity
Browse files

KVM: ensure that memslot userspace addresses are page-aligned 



Bad page translation and silent guest failure ensue if the userspace address is
not page-aligned.  I hit this problem using large (host) pages with qemu,
because qemu currently has a hardcoded 4096-byte alignment for guest memory
allocations.

Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0fdf8e59

virt/kvm/kvm_main.c

+2 −0
Original line number Diff line number Diff line
@@ -715,6 +715,8 @@ int __kvm_set_memory_region(struct kvm *kvm, 
		goto out;

	if (mem->guest_phys_addr & (PAGE_SIZE - 1))

		goto out;

	if (mem->userspace_addr & (PAGE_SIZE - 1))

		goto out;

	if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS)

		goto out;

	if (mem->guest_phys_addr + mem->memory_size < mem->guest_phys_addr)