Skip to content

Commit 1526167

Browse files
author
Al Viro
committed
parisc: fix livelock in uaccess
parisc 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: Helge Deller <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 0b92ed0 commit 1526167

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

arch/parisc/mm/fault.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,13 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
308308

309309
fault = handle_mm_fault(vma, address, flags, regs);
310310

311-
if (fault_signal_pending(fault, regs))
311+
if (fault_signal_pending(fault, regs)) {
312+
if (!user_mode(regs)) {
313+
msg = "Page fault: fault signal on kernel memory";
314+
goto no_context;
315+
}
312316
return;
317+
}
313318

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

0 commit comments

Comments
 (0)