1 files changed, 10 insertions, 1 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 4856a7dcbd7f..002fe0b12c9f 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1028,6 +1028,15 @@ static pfn_t get_fault_pfn(void)
         return fault_pfn;
 }
 
+static inline int check_user_page_hwpoison(unsigned long addr)
+{
+        int rc, flags = FOLL_TOUCH | FOLL_HWPOISON | FOLL_WRITE;
+
+        rc = __get_user_pages(current, current->mm, addr, 1,
+                              flags, NULL, NULL, NULL);
+        return rc == -EHWPOISON;
+}
+
 static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic,
                         bool *async, bool write_fault, bool *writable)
 {
@@ -1075,7 +1084,7 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic,
                         return get_fault_pfn();
 
                 down_read(&current->mm->mmap_sem);
-                if (is_hwpoison_address(addr)) {
+                if (check_user_page_hwpoison(addr)) {
                         up_read(&current->mm->mmap_sem);
                         get_page(hwpoison_page);
                         return page_to_pfn(hwpoison_page);