socsvn commit: r269065 - soc2014/op/freebsd-base/sys/amd64/amd64

op at FreeBSD.org op at FreeBSD.org
Wed Jun 4 14:44:06 UTC 2014


Author: op
Date: Wed Jun  4 14:44:05 2014
New Revision: 269065
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269065

Log:
  SMAP AMD64: clear SMAP state in NMI handler, as soon as possible
  
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap
  
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  

Modified:
  soc2014/op/freebsd-base/sys/amd64/amd64/exception.S

Modified: soc2014/op/freebsd-base/sys/amd64/amd64/exception.S
==============================================================================
--- soc2014/op/freebsd-base/sys/amd64/amd64/exception.S	Wed Jun  4 14:42:50 2014	(r269064)
+++ soc2014/op/freebsd-base/sys/amd64/amd64/exception.S	Wed Jun  4 14:44:05 2014	(r269065)
@@ -455,6 +455,7 @@
  */
 
 IDTVEC(nmi)
+	clac			/* XXXOP */
 	subq	$TF_RIP,%rsp
 	movl	$(T_NMI),TF_TRAPNO(%rsp)
 	movq	$0,TF_ADDR(%rsp)
@@ -479,7 +480,6 @@
 	movw	%es,TF_ES(%rsp)
 	movw	%ds,TF_DS(%rsp)
 	movl	$TF_HASSEGS,TF_FLAGS(%rsp)
-	clac
 	cld
 	xorl	%ebx,%ebx
 	testb	$SEL_RPL_MASK,TF_CS(%rsp)


More information about the svn-soc-all mailing list