AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

KVM: Validate userspace_addr of memslot when registered

Browse Source 
This way, we can avoid checking the user space address many times when
we read the guest memory.

Although we can do the same for write if we check which slots are
writable, we do not care write now: reading the guest memory happens
more often than writing.

[avi: change VERIFY_READ to VERIFY_WRITE]

Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Takuya Yoshikawa 2011-05-07 16:35:38 +09:00 committed by Avi Kivity
parent 12cb814f3b
commit fa3d315a4c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kvm/paging_tmpl.h
View File

@ -185,7 +185,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
} }
ptep_user = (pt_element_t __user *)((void *)host_addr + offset); ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
if (unlikely(copy_from_user(&pte, ptep_user, sizeof(pte)))) { if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte)))) {
present = false; present = false;
break; break;
} }

7
virt/kvm/kvm_main.c
View File

@ -648,7 +648,10 @@ int __kvm_set_memory_region(struct kvm *kvm,
goto out; goto out;
if (mem->guest_phys_addr & (PAGE_SIZE - 1)) if (mem->guest_phys_addr & (PAGE_SIZE - 1))
goto out; 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; goto out;
if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS)
goto out; 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); addr = gfn_to_hva(kvm, gfn);
if (kvm_is_error_hva(addr)) if (kvm_is_error_hva(addr))
return -EFAULT; return -EFAULT;
r = copy_from_user(data, (void __user *)addr + offset, len); r = __copy_from_user(data, (void __user *)addr + offset, len);
if (r) if (r)
return -EFAULT; return -EFAULT;
return 0; return 0;