diff options
| author |   Hillf Danton <hdanton@sina.com> | 2020-04-08 11:59:24 -0400 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-08 09:05:58 -0700 |
| commit | ae46d2aa6a7fbe8ca0946f24b061b6ccdc6c3f25 (patch) | |
| tree | 63df67653103289f0031d7956366af45ad01fe64 /mm | |
| parent | Merge tag 'drm-next-2020-04-08' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | wireguard-linux-ae46d2aa6a7fbe8ca0946f24b061b6ccdc6c3f25.tar.xz wireguard-linux-ae46d2aa6a7fbe8ca0946f24b061b6ccdc6c3f25.zip | |
mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal
__get_user_pages_locked() will return 0 instead of -EINTR after commit
4426e945df588 ("mm/gup: allow VM_FAULT_RETRY for multiple times") which
added extra code to allow gup detect fatal signal faster.
Restore the original -EINTR behavior.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 4426e945df58 ("mm/gup: allow VM_FAULT_RETRY for multiple times")
Reported-by: syzbot+3be1a33f04dc782e9fd5@syzkaller.appspotmail.com
Signed-off-by: Hillf Danton <hdanton@sina.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/gup.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1326,8 +1326,11 @@ retry: * start trying again otherwise it can loop forever. */ - if (fatal_signal_pending(current)) + if (fatal_signal_pending(current)) { + if (!pages_done) + pages_done = -EINTR; break; + } ret = down_read_killable(&mm->mmap_sem); if (ret) { |