mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
ia64: fix livelock in uaccess
ia64 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:
parent
79c54c97c7
commit
d088af1e22
1 changed files with 4 additions and 1 deletions
|
@ -136,8 +136,11 @@ retry:
|
||||||
*/
|
*/
|
||||||
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))
|
||||||
|
goto no_context;
|
||||||
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)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue