Author: kib
Date: Tue Feb 5 17:54:02 2019
New Revision: 343782
URL: https://svnweb.freebsd.org/changeset/base/343782
Log:
MFC r343780:
amd64: clear callee-preserved registers on syscall exit.
Approved by: so
Security: CVE-2019-5595
Modified:
stable/11/sys/amd64/amd64/exception.S
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/amd64/amd64/exception.S
==============================================================================
--- stable/11/sys/amd64/amd64/exception.S Tue Feb 5 17:52:06 2019
(r343781)
+++ stable/11/sys/amd64/amd64/exception.S Tue Feb 5 17:54:02 2019
(r343782)
@@ -511,12 +511,14 @@ fast_syscall_common:
movq TF_RFLAGS(%rsp),%r11 /* original %rflags */
movq TF_RIP(%rsp),%rcx /* original %rip */
movq TF_RSP(%rsp),%rsp /* user stack pointer */
+ xorl %r8d,%r8d /* zero the rest of GPRs */
+ xorl %r10d,%r10d
cmpq $~0,PCPU(UCR3)
je 2f
movq PCPU(UCR3),%r9
movq %r9,%cr3
- xorl %r9d,%r9d
-2: swapgs
+2: xorl %r9d,%r9d
+ swapgs
sysretq
3: /* AST scheduled. */
_______________________________________________
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"
