summaryrefslogtreecommitdiffstats
path: root/sys/amd64/amd64/exception.S
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2011-09-11 18:00:46 +0000
committerkib <kib@FreeBSD.org>2011-09-11 18:00:46 +0000
commit91ab853ec40e0f9737d7c63956e370770f19c462 (patch)
tree00f39b80abdea4f91950d3a053f310bce28ab8cf /sys/amd64/amd64/exception.S
parent129f307eb8da19efe6822cc88e81b5dcf0e0e7ff (diff)
downloadFreeBSD-src-91ab853ec40e0f9737d7c63956e370770f19c462.zip
FreeBSD-src-91ab853ec40e0f9737d7c63956e370770f19c462.tar.gz
The jump target shall be after the padding, not into it.
Reported by: alc Approved by: re (bz) MFC after: 2 weeks
Diffstat (limited to 'sys/amd64/amd64/exception.S')
-rw-r--r--sys/amd64/amd64/exception.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index b5b84ed..9f0c69a 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -398,8 +398,9 @@ IDTVEC(fast_syscall)
movq %rsp, %rdi
call ast
jmp 1b
-2: /* Restore preserved registers. */
+
.align 16
+2: /* Restore preserved registers. */
MEXITCOUNT
movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */
movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */
OpenPOWER on IntegriCloud