summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kvm/paging_tmpl.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 52450a6b784f..88ca456ccd68 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -115,20 +115,6 @@ static unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, pt_element_t gpte)
return access;
}
-static int FNAME(read_gpte)(pt_element_t *pte, pt_element_t __user *ptep_user)
-{
-#if defined(CONFIG_X86_32) && (PTTYPE == 64)
- u32 *p = (u32 *)pte;
- u32 __user *p_user = (u32 __user *)ptep_user;
-
- if (unlikely(get_user(*p, p_user)))
- return -EFAULT;
- return get_user(*(p + 1), p_user + 1);
-#else
- return get_user(*pte, ptep_user);
-#endif
-}
-
/*
* Fetch a guest pte for a guest virtual address
*/
@@ -199,7 +185,7 @@ walk:
}
ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
- if (unlikely(FNAME(read_gpte)(&pte, ptep_user))) {
+ if (unlikely(copy_from_user(&pte, ptep_user, sizeof(pte)))) {
present = false;
break;
}