---

yaml --- r: 93780 b: refs/heads/master c: 0aac03f h: refs/heads/master v: v3
git-mirror · Apr 27, 2008 · 607387e · 607387e
1 parent 5b7838e
commit 607387e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31bb117eb48f2629e030ca547ca89a1c34150183
+refs/heads/master: 0aac03f07b37da96e00371e66973d5ffaae578a4
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
@@ -554,7 +554,9 @@ int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
 	addr = gfn_to_hva(kvm, gfn);
 	if (kvm_is_error_hva(addr))
 		return -EFAULT;
+	pagefault_disable();
 	r = __copy_from_user_inatomic(data, (void __user *)addr + offset, len);
+	pagefault_enable();
 	if (r)
 		return -EFAULT;
 	return 0;