From 16fc771d93d399716387ad469ea2880af8d20e0f Mon Sep 17 00:00:00 2001
From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Thu, 28 Apr 2011 07:08:36 +0900
Subject: [PATCH] --- yaml --- r: 248089 b: refs/heads/master c:
 8f74d8e16812d63639871b4e56409b08bdcb66fc h: refs/heads/master i:   248087:
 b16816d1af3fce58fb5d1cf5f8be13fed6a5f92c v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kvm/paging_tmpl.h | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 725c490fa68e..d76c601838cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b74323dc2b7b5690d18bc7934b98e4665e778a7b
+refs/heads/master: 8f74d8e16812d63639871b4e56409b08bdcb66fc
diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h
index 652d56c081f7..52450a6b784f 100644
--- a/trunk/arch/x86/kvm/paging_tmpl.h
+++ b/trunk/arch/x86/kvm/paging_tmpl.h
@@ -115,6 +115,20 @@ 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
  */
@@ -185,7 +199,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
 		}
 
 		ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
-		if (unlikely(get_user(pte, ptep_user))) {
+		if (unlikely(FNAME(read_gpte)(&pte, ptep_user))) {
 			present = false;
 			break;
 		}