Author: kib
Date: Mon Aug 24 22:12:45 2020
New Revision: 364734
URL: https://svnweb.freebsd.org/changeset/base/364734
Log:
Restore workaround for sysret fault on non-canonical address after LA57.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/amd64/amd64/trap.c
Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c Mon Aug 24 20:40:26 2020 (r364733)
+++ head/sys/amd64/amd64/trap.c Mon Aug 24 22:12:45 2020 (r364734)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
