2 files changed, 5 insertions, 4 deletions

diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index 56f553391896..ea475cd03511 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -111,7 +111,7 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)
                         list_entry(vcpu->async_pf.done.next,
                                    typeof(*work), link);
                 list_del(&work->link);
-                if (work->page)
+                if (!is_error_page(work->page))
                         kvm_release_page_clean(work->page);
                 kmem_cache_free(async_pf_cache, work);
         }
@@ -138,7 +138,7 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)
 
                 list_del(&work->queue);
                 vcpu->async_pf.queued--;
-                if (work->page)
+                if (!is_error_page(work->page))
                         kvm_release_page_clean(work->page);
                 kmem_cache_free(async_pf_cache, work);
         }
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index eafba99d1070..a2e85af847c1 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1186,8 +1186,9 @@ EXPORT_SYMBOL_GPL(gfn_to_page);
 
 void kvm_release_page_clean(struct page *page)
 {
-        if (!is_error_page(page))
-                kvm_release_pfn_clean(page_to_pfn(page));
+        WARN_ON(is_error_page(page));
+
+        kvm_release_pfn_clean(page_to_pfn(page));
 }
 EXPORT_SYMBOL_GPL(kvm_release_page_clean);