mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

microblaze: fix livelock in uaccess

Browse source 
microblaze equivalent of 26178ec11e "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>
This commit is contained in:
Al Viro 2023-01-30 23:50:22 -05:00
parent d088af1e22
commit a1179ac743
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/microblaze/mm/fault.c
View file

@ -219,8 +219,11 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
*/ */
fault = handle_mm_fault(vma, address, flags, regs); fault = handle_mm_fault(vma, address, flags, regs);
if (fault_signal_pending(fault, regs)) if (fault_signal_pending(fault, regs)) {
if (!user_mode(regs))
bad_page_fault(regs, address, SIGBUS);
return; return;
}
/* The fault is fully completed (including releasing mmap lock) */ /* The fault is fully completed (including releasing mmap lock) */
if (fault & VM_FAULT_COMPLETED) if (fault & VM_FAULT_COMPLETED)