Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aac03f0 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Avi Kivity
Browse files

KVM: Disable pagefaults during copy_from_user_inatomic() 



With CONFIG_PREEMPT=n, this is needed in order to disable the fault-in
code from sleeping.

Signed-off-by: default avatarAndrea Arcangeli <andrea@qumranet.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 31bb117e

virt/kvm/kvm_main.c

+2 −0
Original line number Diff line number Diff line
@@ -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;