|
@@ -648,7 +648,10 @@ int __kvm_set_memory_region(struct kvm *kvm,
|
|
|
goto out;
|
|
|
if (mem->guest_phys_addr & (PAGE_SIZE - 1))
|
|
|
goto out;
|
|
|
- if (user_alloc && (mem->userspace_addr & (PAGE_SIZE - 1)))
|
|
|
+ /* We can read the guest memory with __xxx_user() later on. */
|
|
|
+ if (user_alloc &&
|
|
|
+ ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
|
|
|
+ !access_ok(VERIFY_WRITE, mem->userspace_addr, mem->memory_size)))
|
|
|
goto out;
|
|
|
if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS)
|
|
|
goto out;
|
|
@@ -1283,7 +1286,7 @@ int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
|
|
|
addr = gfn_to_hva(kvm, gfn);
|
|
|
if (kvm_is_error_hva(addr))
|
|
|
return -EFAULT;
|
|
|
- r = copy_from_user(data, (void __user *)addr + offset, len);
|
|
|
+ r = __copy_from_user(data, (void __user *)addr + offset, len);
|
|
|
if (r)
|
|
|
return -EFAULT;
|
|
|
return 0;
|