From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 28 17:25:54 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B55A6E66;
 Mon, 28 Jan 2013 17:25:54 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 91E4FDDD;
 Mon, 28 Jan 2013 17:25:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SHPsWr053111;
 Mon, 28 Jan 2013 17:25:54 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SHPsje053110;
 Mon, 28 Jan 2013 17:25:54 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201301281725.r0SHPsje053110@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Mon, 28 Jan 2013 17:25:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246036 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2013 17:25:54 -0000

Author: cherry
Date: Mon Jan 28 17:25:53 2013
New Revision: 246036
URL: http://svnweb.freebsd.org/changeset/base/246036

Log:
  Exception handling stack bugs:
   i) Stop overwriting the previous stackframe
   ii) Restore stack frame *after* restoring registers after alignment check
  
  Approved by: gibbs (implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/exception.S

Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/exception.S	Mon Jan 28 15:48:31 2013	(r246035)
+++ projects/amd64_xen_pv/sys/amd64/xen/exception.S	Mon Jan 28 17:25:53 2013	(r246036)
@@ -131,10 +131,10 @@
 	subq 	$TF_ERR, %rsp
 
 #define TRAP_FRAME_EXIT_NOERR \
-	addq	$TF_RIP + 8, %rsp
+	addq	$TF_RIP, %rsp
 
 #define TRAP_FRAME_EXIT_ERR \
-	addq 	$TF_ERR + 8, %rsp
+	addq 	$TF_ERR, %rsp
 
 #define TRAP_PROLOGUE(a) \
 	movl	$(a), TF_TRAPNO(%rsp) 	; \
@@ -434,9 +434,9 @@ IDTVEC(ac)			/* Alignment-Check */
 	DO_STI_MAYBE		;
 	CALLTRAP		;
 	DO_AST_MAYBE		;
-	TRAP_FRAME_EXIT_ERR   	;
 	RESTORE_GENERAL_REGS	;
 	RESTORE_SEGMENT_REGS	;
+	TRAP_FRAME_EXIT_ERR   	;
 	INTR_EXIT		;
 
 IDTVEC(mc)			/* Machine-Check */