1 files changed, 4 insertions, 1 deletions

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 2509e4fe6992..1f22a41565a3 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -435,8 +435,11 @@ retry:
                  * the mmap_sem because it would already be released
                  * in __lock_page_or_retry in mm/filemap.c.
                  */
-                if (fatal_signal_pending(current))
+                if (fatal_signal_pending(current)) {
+                        if (!user_mode(regs))
+                                goto no_context;
                         return 0;
+                }
 
                 /*
                  * Clear FAULT_FLAG_ALLOW_RETRY to avoid any risk of