Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

riscv: fix livelock in uaccess

riscv equivalent of 26178ec11ef3 "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 <bjorn@kernel.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro d835eb3a bd75497a

+4 -1
+4 -1
arch/riscv/mm/fault.c
··· 324 324 * signal first. We do not need to release the mmap_lock because it 325 325 * would already be released in __lock_page_or_retry in mm/filemap.c. 326 326 */ 327 - if (fault_signal_pending(fault, regs)) 327 + if (fault_signal_pending(fault, regs)) { 328 + if (!user_mode(regs)) 329 + no_context(regs, addr); 328 330 return; 331 + } 329 332 330 333 /* The fault is fully completed (including releasing mmap lock) */ 331 334 if (fault & VM_FAULT_COMPLETED)