svn commit: r354769 - stable/11/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Sat Nov 16 11:00:22 2019
New Revision: 354769
URL: https://svnweb.freebsd.org/changeset/base/354769

Log:
  MFC r354696:
  amd64: only set PCB_FULL_IRET pcb flag when #gp or similar exception comes
  from usermode.

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	Sat Nov 16 10:50:10 2019	(r354768)
+++ stable/11/sys/amd64/amd64/exception.S	Sat Nov 16 11:00:22 2019	(r354769)
@@ -492,8 +492,8 @@ prot_addrf:
 3:	cmpw	$KUG32SEL,TF_GS(%rsp)
 	jne	4f
 	movq	%rdx,PCB_GSBASE(%rdi)
+	orl	$PCB_FULL_IRET,PCB_FLAGS(%rdi)	/* full iret from user #gp */
 4:	call	handle_ibrs_entry
-	orl	$PCB_FULL_IRET,PCB_FLAGS(%rdi)	/* always full iret from GPF */
 	movw	%es,TF_ES(%rsp)
 	movw	%ds,TF_DS(%rsp)
 	testl	$PSL_I,TF_RFLAGS(%rsp)