summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorAndres Lagar-Cavilla <andreslc@google.com>2014-09-25 15:26:50 -0700
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-26 10:21:29 +0200
commitbb0ca6acd466af55c95b7ce508f29e23a24cabd9 (patch)
tree99f2d6b8963f869e35a1be940183f77d939c5bb8 /virt
parent00c027db0cc4b7387b258330482c6e5f5e836b18 (diff)
downloadlinux-bb0ca6acd466af55c95b7ce508f29e23a24cabd9.tar.gz
linux-bb0ca6acd466af55c95b7ce508f29e23a24cabd9.tar.bz2
linux-bb0ca6acd466af55c95b7ce508f29e23a24cabd9.zip
kvm: Fix kvm_get_page_retry_io __gup retval check
Confusion around -EBUSY and zero (inside a BUG_ON no less). Reported-by: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Andres Lagar-Cavilla <andreslc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3f16f569169e..a1cf53ee0d28 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -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,
&locked);
if (!locked) {
- VM_BUG_ON(npages != -EBUSY);
+ VM_BUG_ON(npages);
if (!pagep)
return 0;