Commit e26db7ad authored by Guo Ren's avatar Guo Ren

csky: mm: abort uaccess retries upon fatal signal

Pick up the patch from the 'Link' made by Mark Rutland. Keep the
same with x86, arm, arm64, arc, sh, power.

Link: https://lore.kernel.org/linux-arm-kernel/1499782763-31418-1-git-send-email-mark.rutland@arm.com/Signed-off-by: default avatarGuo Ren <guoren@linux.alibaba.com>
Cc: Mark Rutland <mark.rutland@arm.com>
parent bd0bf90e
...@@ -279,8 +279,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs) ...@@ -279,8 +279,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
* signal first. We do not need to release the mmap_lock because it * signal first. We do not need to release the mmap_lock because it
* would already be released in __lock_page_or_retry in mm/filemap.c. * would already be released in __lock_page_or_retry in mm/filemap.c.
*/ */
if (fault_signal_pending(fault, regs)) if (fault_signal_pending(fault, regs)) {
if (!user_mode(regs))
no_context(regs, addr);
return; return;
}
if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) { if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) {
flags |= FAULT_FLAG_TRIED; flags |= FAULT_FLAG_TRIED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment