Skip to content

Commit e902e50

Browse files
author
Al Viro
committed
nios2: fix livelock in uaccess
nios2 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 a1179ac commit e902e50

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/nios2/mm/fault.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause,
136136
*/
137137
fault = handle_mm_fault(vma, address, flags, regs);
138138

139-
if (fault_signal_pending(fault, regs))
139+
if (fault_signal_pending(fault, regs)) {
140+
if (!user_mode(regs))
141+
goto no_context;
140142
return;
143+
}
141144

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

0 commit comments

Comments
 (0)