Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jul 2018 07:58:57 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r335857 - stable/11/sys/amd64/include
Message-ID:  <201807020758.w627wvqM051048@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Mon Jul  2 07:58:57 2018
New Revision: 335857
URL: https://svnweb.freebsd.org/changeset/base/335857

Log:
  MFC r335635:
  Do not leave stray qword on top of stack for interrupts and exceptions
  without error code.  Doing so it mis-aligned the stack.
  
  PR:	229222

Modified:
  stable/11/sys/amd64/include/asmacros.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/include/asmacros.h
==============================================================================
--- stable/11/sys/amd64/include/asmacros.h	Mon Jul  2 05:19:44 2018	(r335856)
+++ stable/11/sys/amd64/include/asmacros.h	Mon Jul  2 07:58:57 2018	(r335857)
@@ -185,7 +185,7 @@
 	movq	PCPU(KCR3),%rax
 	movq	%rax,%cr3
 	movq	PCPU(RSP0),%rax
-	subq	$PTI_SIZE,%rax
+	subq	$PTI_SIZE - 8 * (1 - \has_err),%rax
 	MOVE_STACKS	((PTI_SIZE / 8) - 1 + \has_err)
 	movq	%rax,%rsp
 	popq	%rdx



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807020758.w627wvqM051048>