From edc7b30f98b3ea0ba89e56a683186e6b2a36719f Mon Sep 17 00:00:00 2001 From: Takuya Yoshikawa Date: Sat, 7 May 2011 16:31:36 +0900 Subject: [PATCH] --- yaml --- r: 248099 b: refs/heads/master c: 12cb814f3bb35736420cc6bfc9fed7b6a9d3a828 h: refs/heads/master i: 248097: fdcbd2cbefd3e4a25eb06328458ddd2bc6889014 248095: 4a2acc9249e8f01242e13499b5bdbffa7762c69c v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/paging_tmpl.h | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 5f99cfd7d8f5..91f778b4e360 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ce941ee4258b836cf818d2ac159d8cf3ebad648 +refs/heads/master: 12cb814f3bb35736420cc6bfc9fed7b6a9d3a828 diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h index 52450a6b784f..88ca456ccd68 100644 --- a/trunk/arch/x86/kvm/paging_tmpl.h +++ b/trunk/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 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, } 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; }