Skip to content

Commit dce4549

Browse files
author
Al Viro
committed
alpha: fix livelock in uaccess
alpha 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. Signed-off-by: Al Viro <[email protected]>
1 parent 1526167 commit dce4549

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/alpha/mm/fault.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,11 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
152152
the fault. */
153153
fault = handle_mm_fault(vma, address, flags, regs);
154154

155-
if (fault_signal_pending(fault, regs))
155+
if (fault_signal_pending(fault, regs)) {
156+
if (!user_mode(regs))
157+
goto no_context;
156158
return;
159+
}
157160

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

0 commit comments

Comments
 (0)