d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore workaround for sysret fault on non-canonical address after LA57.

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2020-08-24 22:12:45 +00:00
parent 2a5220e12e
commit f1e1c4ad73
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/amd64/trap.c
View File

@ -1189,7 +1189,8 @@ amd64_syscall(struct thread *td, int traced)
* not be safe. Instead, use the full return path which
* catches the problem safely.
*/
if (__predict_false(td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS))
if (__predict_false(td->td_frame->tf_rip >= (la57 ?
VM_MAXUSER_ADDRESS_LA57 : VM_MAXUSER_ADDRESS_LA48)))
set_pcb_flags(td->td_pcb, PCB_FULL_IRET);
amd64_syscall_ret_flush_l1d_check_inline(td->td_errno);