Skip to content

Commit 0b92ed0

Browse files
author
Al Viro
committed
hexagon: fix livelock in uaccess
hexagon equivalent of 26178ec "x86: mm: consolidate VM_FAULT_RETRY handling" If e.g. get_user() triggers a page fault and a fatal signal is caught, we might end up with handle_mm_fault() returning VM_FAULT_RETRY and not doing anything to page tables. In such case we must *not* return to the faulting insn - that would repeat the entire thing without making any progress; what we need instead is to treat that as failed (user) memory access. Acked-by: Brian Cain <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent d835eb3 commit 0b92ed0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/hexagon/mm/vm_fault.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,11 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs)
9393

9494
fault = handle_mm_fault(vma, address, flags, regs);
9595

96-
if (fault_signal_pending(fault, regs))
96+
if (fault_signal_pending(fault, regs)) {
97+
if (!user_mode(regs))
98+
goto no_context;
9799
return;
100+
}
98101

99102
/* The fault is fully completed (including releasing mmap lock) */
100103
if (fault & VM_FAULT_COMPLETED)

0 commit comments

Comments
 (0)