Skip to content

Commit d835eb3

Browse files
author
Al Viro
committed
riscv: fix livelock in uaccess
riscv 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. Tested-by: Björn Töpel <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent bd75497 commit d835eb3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/riscv/mm/fault.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
324324
* signal first. We do not need to release the mmap_lock because it
325325
* would already be released in __lock_page_or_retry in mm/filemap.c.
326326
*/
327-
if (fault_signal_pending(fault, regs))
327+
if (fault_signal_pending(fault, regs)) {
328+
if (!user_mode(regs))
329+
no_context(regs, addr);
328330
return;
331+
}
329332

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

0 commit comments

Comments
 (0)