From owner-svn-soc-all@FreeBSD.ORG  Wed Jun  4 14:41:42 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F095E4EB
 for <svn-soc-all@FreeBSD.org>; Wed,  4 Jun 2014 14:41:42 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD3182A43
 for <svn-soc-all@FreeBSD.org>; Wed,  4 Jun 2014 14:41:42 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54Efg0P059970
 for <svn-soc-all@FreeBSD.org>; Wed, 4 Jun 2014 14:41:42 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s54Efgx2059968
 for svn-soc-all@FreeBSD.org; Wed, 4 Jun 2014 14:41:42 GMT
 (envelope-from op@FreeBSD.org)
Date: Wed, 4 Jun 2014 14:41:42 GMT
Message-Id: <201406041441.s54Efgx2059968@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r269062 - soc2014/op/freebsd-base/sys/amd64/ia32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jun 2014 14:41:43 -0000

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

Log:
  AMD64 SMAP: clear SMAP state on exceptions in ia32 case
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  

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

Modified: soc2014/op/freebsd-base/sys/amd64/ia32/ia32_exception.S
==============================================================================
--- soc2014/op/freebsd-base/sys/amd64/ia32/ia32_exception.S	Wed Jun  4 13:42:19 2014	(r269061)
+++ soc2014/op/freebsd-base/sys/amd64/ia32/ia32_exception.S	Wed Jun  4 14:41:41 2014	(r269062)
@@ -67,6 +67,7 @@
 	movq	%r14,TF_R14(%rsp)
 	movq	%r15,TF_R15(%rsp)
 	movl	$TF_HASSEGS,TF_FLAGS(%rsp)
+	clac
 	cld
 	FAKE_MCOUNT(TF_RIP(%rsp))
 	movq	%rsp, %rdi