| Message ID | Y9l0EDRr9DpNb5Pb@ZenIV (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | [01/10] alpha: fix livelock in uaccess | expand |
Hello: This series was applied to riscv/linux.git (fixes) by Al Viro <viro@zeniv.linux.org.uk>: On Tue, 31 Jan 2023 20:03:28 +0000 you wrote: > alpha 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. > > [...] Here is the summary with links: - [01/10] alpha: fix livelock in uaccess (no matching commit) - [02/10] hexagon: fix livelock in uaccess (no matching commit) - [03/10] ia64: fix livelock in uaccess (no matching commit) - [04/10] m68k: fix livelock in uaccess (no matching commit) - [05/10] microblaze: fix livelock in uaccess (no matching commit) - [06/10] nios2: fix livelock in uaccess (no matching commit) - [07/10] openrisc: fix livelock in uaccess (no matching commit) - [08/10] parisc: fix livelock in uaccess (no matching commit) - [09/10] riscv: fix livelock in uaccess https://git.kernel.org/riscv/c/d835eb3a57de - [10/10] sparc: fix livelock in uaccess (no matching commit) You are awesome, thank you!
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index ef427a6bdd1a..7b01ae4f3bc6 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -152,8 +152,11 @@ do_page_fault(unsigned long address, unsigned long mmcsr, the fault. */ fault = handle_mm_fault(vma, address, flags, regs); - if (fault_signal_pending(fault, regs)) + if (fault_signal_pending(fault, regs)) { + if (!user_mode(regs)) + goto no_context; return; + } /* The fault is fully completed (including releasing mmap lock) */ if (fault & VM_FAULT_COMPLETED)
alpha 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. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- arch/alpha/mm/fault.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)