From owner-svn-soc-all@FreeBSD.ORG  Thu Jun 12 22:31:00 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E70DA193
 for <svn-soc-all@FreeBSD.org>; Thu, 12 Jun 2014 22:31:00 +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 D40D72095
 for <svn-soc-all@FreeBSD.org>; Thu, 12 Jun 2014 22:31:00 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CMV0FR031298
 for <svn-soc-all@FreeBSD.org>; Thu, 12 Jun 2014 22:31:00 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5CMV0hX031183
 for svn-soc-all@FreeBSD.org; Thu, 12 Jun 2014 22:31:00 GMT
 (envelope-from op@FreeBSD.org)
Date: Thu, 12 Jun 2014 22:31:00 GMT
Message-Id: <201406122231.s5CMV0hX031183@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: r269488 - 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: Thu, 12 Jun 2014 22:31:01 -0000

Author: op
Date: Thu Jun 12 22:30:59 2014
New Revision: 269488
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269488

Log:
  SMAP i386: updated trap handler
  
  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/i386/i386/trap.c

Modified: soc2014/op/freebsd-base/sys/i386/i386/trap.c
==============================================================================
--- soc2014/op/freebsd-base/sys/i386/i386/trap.c	Thu Jun 12 22:30:15 2014	(r269487)
+++ soc2014/op/freebsd-base/sys/i386/i386/trap.c	Thu Jun 12 22:30:59 2014	(r269488)
@@ -866,7 +866,9 @@
 		 *  value of EFLAGS.AC." - Intel Ref. # 319433-014 9.3.2
 		 */
 		if (__predict_false(smap_access_violation(frame, usermode))) {
-			panic("SMAP!");
+			printf("Supervisor Mode Access Prevention\n");
+			trap_fatal(frame, eva);
+			return (-1);
 		}
 
 		/*