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

Commit e7cacd40 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: Fix kernel allocated memory slot 



Commit 7fd49de9773fdcb7b75e823b21c1c5dc1e218c14 "KVM: ensure that memslot
userspace addresses are page-aligned" broke kernel space allocated memory
slot, for the userspace_addr is invalid.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 30ed5bb6

virt/kvm/kvm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ 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))

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

		goto out;

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

		goto out;