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

Commit bb0ca6ac authored by Andres Lagar-Cavilla's avatar Andres Lagar-Cavilla Committed by Paolo Bonzini
Browse files

kvm: Fix kvm_get_page_retry_io __gup retval check 



Confusion around -EBUSY and zero (inside a BUG_ON no less).

Reported-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Signed-off-by: default avatarAndres Lagar-Cavilla <andreslc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 00c027db

virt/kvm/kvm_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1146,7 +1146,7 @@ int kvm_get_user_page_io(struct task_struct *tsk, struct mm_struct *mm, 
	npages = __get_user_pages(tsk, mm, addr, 1, flags, pagep, NULL,

	npages = __get_user_pages(tsk, mm, addr, 1, flags, pagep, NULL,

				  &locked);

				  &locked);

	if (!locked) {

	if (!locked) {

		VM_BUG_ON(npages != -EBUSY);

		VM_BUG_ON(npages);





		if (!pagep)

		if (!pagep)

			return 0;

			return 0;