From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 13 00:39:47 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 7D5F89E0
 for <svn-soc-all@FreeBSD.org>; Fri, 13 Jun 2014 00:39:47 +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 69DCB2B54
 for <svn-soc-all@FreeBSD.org>; Fri, 13 Jun 2014 00:39:47 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5D0dlEk074804
 for <svn-soc-all@FreeBSD.org>; Fri, 13 Jun 2014 00:39:47 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5D0dkrd074790
 for svn-soc-all@FreeBSD.org; Fri, 13 Jun 2014 00:39:47 GMT
 (envelope-from op@FreeBSD.org)
Date: Fri, 13 Jun 2014 00:39:47 GMT
Message-Id: <201406130039.s5D0dkrd074790@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: r269497 - soc2014/op/freebsd-base/sys/i386/i386
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: Fri, 13 Jun 2014 00:39:47 -0000

Author: op
Date: Fri Jun 13 00:39:46 2014
New Revision: 269497
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269497

Log:
  SMAP i386: stac instruction should fail when used with lock prefix
  
  git: https://github.com/opntr/opBSD/commits/op/gsoc2014/smap
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  

Modified:
  soc2014/op/freebsd-base/sys/i386/i386/support.s

Modified: soc2014/op/freebsd-base/sys/i386/i386/support.s
==============================================================================
--- soc2014/op/freebsd-base/sys/i386/i386/support.s	Fri Jun 13 00:34:34 2014	(r269496)
+++ soc2014/op/freebsd-base/sys/i386/i386/support.s	Fri Jun 13 00:39:46 2014	(r269497)
@@ -421,10 +421,10 @@
 	cmpl	$VM_MAXUSER_ADDRESS-4,%edx	/* verify address is valid */
 	ja	fusufault
 
+	stac					/* open user-space */
 #ifdef SMP
 	lock
 #endif
-	stac					/* open user-space */
 	cmpxchgl %ecx,(%edx)			/* Compare and set. */
 	clac					/* close user-space */