svn commit: r298622 - stable/9/sys/amd64/amd64

[Andriy Gapon]

Author: avg
Date: Tue Apr 26 07:40:56 2016
New Revision: 298622
URL: https://svnweb.freebsd.org/changeset/base/298622

Log:
  MFC r297846: [amd64] dtrace_invop handler is to be called only for
  kernel exceptions

Modified:
  stable/9/sys/amd64/amd64/exception.S
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/exception.S
==============================================================================
--- stable/9/sys/amd64/amd64/exception.S	Tue Apr 26 07:40:07 2016	(r298621)
+++ stable/9/sys/amd64/amd64/exception.S	Tue Apr 26 07:40:56 2016	(r298622)
@@ -212,6 +212,8 @@ alltraps_pushregs_no_rdi:
 	 * interrupt. For all other trap types, just handle them in
 	 * the usual way.
 	 */
+	testb	$SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
+	jnz	calltrap		/* ignore userland traps */
 	cmpl	$T_BPTFLT,TF_TRAPNO(%rsp)
 	jne	calltrap