Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Guo Ren <guoren@linux.alibaba.com>
Cc: Mark Rutland <mark.rutland@arm.com>
+4
-1
+4
-1
arch/csky/mm/fault.c
+4
-1
arch/csky/mm/fault.c
···
279
279
* signal first. We do not need to release the mmap_lock because it
280
280
* would already be released in __lock_page_or_retry in mm/filemap.c.
281
281
*/
282
-
if (fault_signal_pending(fault, regs))
282
+
if (fault_signal_pending(fault, regs)) {
283
+
if (!user_mode(regs))
284
+
no_context(regs, addr);
283
285
return;
286
+
}
284
287
285
288
if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) {
286
289
flags |= FAULT_FLAG_TRIED;