Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Apr 2016 07:40:07 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r298621 - stable/10/sys/amd64/amd64
Message-ID:  <201604260740.u3Q7e7Ka099560@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Tue Apr 26 07:40:07 2016
New Revision: 298621
URL: https://svnweb.freebsd.org/changeset/base/298621

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

Modified:
  stable/10/sys/amd64/amd64/exception.S

Modified: stable/10/sys/amd64/amd64/exception.S
==============================================================================
--- stable/10/sys/amd64/amd64/exception.S	Tue Apr 26 06:50:41 2016	(r298620)
+++ stable/10/sys/amd64/amd64/exception.S	Tue Apr 26 07:40:07 2016	(r298621)
@@ -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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604260740.u3Q7e7Ka099560>