1 files changed, 10 insertions, 3 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 806a37ec71bd..346ee7e041fd 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1576,9 +1576,16 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                                 if (ret & VM_FAULT_ERROR) {
                                         if (ret & VM_FAULT_OOM)
                                                 return i ? i : -ENOMEM;
-                                        if (ret &
-                                            (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE|
-                                             VM_FAULT_SIGBUS))
+                                        if (ret & (VM_FAULT_HWPOISON |
+                                                   VM_FAULT_HWPOISON_LARGE)) {
+                                                if (i)
+                                                        return i;
+                                                else if (gup_flags & FOLL_HWPOISON)
+                                                        return -EHWPOISON;
+                                                else
+                                                        return -EFAULT;
+                                        }
+                                        if (ret & VM_FAULT_SIGBUS)
                                                 return i ? i : -EFAULT;
                                         BUG();
                                 }