aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm/kvm_main.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2011-05-24 01:51:27 -0400
committerAvi Kivity <avi@redhat.com>2011-05-26 02:41:44 -0400
commit9e3bb6b6f6a0c535eb053fbf0005a8e79e053374 (patch)
tree3127b663749b62d3dff6a7253b9f1cc3baafe571 /virt/kvm/kvm_main.c
parentea2b50ef4c9e030749ae473e95258f477c3a68ca (diff)
KVM: add missing void __user * cast to access_ok() call
fa3d315a "KVM: Validate userspace_addr of memslot when registered" introduced this new warning onn s390: kvm_main.c: In function '__kvm_set_memory_region': kvm_main.c:654:7: warning: passing argument 1 of '__access_ok' makes pointer from integer without a cast arch/s390/include/asm/uaccess.h:53:19: note: expected 'const void *' but argument is of type '__u64' Add the missing cast to get rid of it again... Cc: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r--virt/kvm/kvm_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 22cdb960660a..383f492a6603 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -651,7 +651,9 @@ int __kvm_set_memory_region(struct kvm *kvm,
651 /* We can read the guest memory with __xxx_user() later on. */ 651 /* We can read the guest memory with __xxx_user() later on. */
652 if (user_alloc && 652 if (user_alloc &&
653 ((mem->userspace_addr & (PAGE_SIZE - 1)) || 653 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
654 !access_ok(VERIFY_WRITE, mem->userspace_addr, mem->memory_size))) 654 !access_ok(VERIFY_WRITE,
655 (void __user *)(unsigned long)mem->userspace_addr,
656 mem->memory_size)))
655 goto out; 657 goto out;
656 if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) 658 if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS)
657 goto out; 659 goto out;