From: Guo Ren <guoren@linux.alibaba.com>
Date: Wed, 30 Dec 2020 10:06:22 +0000 (+0000)
Subject: csky: mm: abort uaccess retries upon fatal signal
X-Git-Tag: v5.12-rc1~3^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e26db7ad9c319496bcbe6043d9d4e1d1da3ec613;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c
index c7b67976bac49..1482de56f4f7e 100644
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -279,8 +279,11 @@ good_area:
 	 * 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.
 	 */
-	if (fault_signal_pending(fault, regs))
+	if (fault_signal_pending(fault, regs)) {
+		if (!user_mode(regs))
+			no_context(regs, addr);
 		return;
+	}
 
 	if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) {
 		flags |= FAULT_FLAG_TRIED;