summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-06-08 13:20:39 +0000
committermiod <miod@openbsd.org>2014-06-08 13:20:39 +0000
commit6009b050cca2cbc75b27b44229d259af9e5ce3c1 (patch)
treec6b68afccb39f990116d5b43829dc505f6743ac0
parent/* on some platforms time_t may be a float */ (diff)
downloadwireguard-openbsd-6009b050cca2cbc75b27b44229d259af9e5ce3c1.tar.xz
wireguard-openbsd-6009b050cca2cbc75b27b44229d259af9e5ce3c1.zip
Stop accepting system calls on trap vectors 128 and 129. Userland has not
been doing this since almost 1.5 years and there has been the 64-bit time_t bump in between, so no old binary should remain.
-rw-r--r--sys/arch/m88k/m88k/subr.S6
-rw-r--r--sys/arch/m88k/m88k/vectors_88100.S6
-rw-r--r--sys/arch/m88k/m88k/vectors_88110.S6
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/m88k/m88k/subr.S b/sys/arch/m88k/m88k/subr.S
index f87dcdaa035..6d10b422fea 100644
--- a/sys/arch/m88k/m88k/subr.S
+++ b/sys/arch/m88k/m88k/subr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.S,v 1.23 2013/08/24 20:54:29 miod Exp $ */
+/* $OpenBSD: subr.S,v 1.24 2014/06/08 13:20:39 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1992 Carnegie Mellon University
@@ -1086,13 +1086,13 @@ ENTRY(longjmp)
ENTRY(sigcode) /* r31 points to sigframe */
ld %r2, %r31, 0 /* pick sigcontext* */
or %r13, %r0, SYS_sigreturn
- tb0 0, %r0, 128 /* syscall trap, calling sigreturn */
+ tb0 0, %r0, 450 /* syscall trap, calling sigreturn */
NOP | failure return
#ifdef dontbother /* sigreturn will not return unless it fails */
NOP | success return
#endif
or %r13, %r0, SYS_exit
- tb0 0, %r0, 128 /* syscall trap, exit */
+ tb0 0, %r0, 450 /* syscall trap, exit */
/*
* this never returns, but we need to provide fetchable instructions
* for the 88100 pipeline.
diff --git a/sys/arch/m88k/m88k/vectors_88100.S b/sys/arch/m88k/m88k/vectors_88100.S
index bbf3e720ff4..919bde7bffb 100644
--- a/sys/arch/m88k/m88k/vectors_88100.S
+++ b/sys/arch/m88k/m88k/vectors_88100.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: vectors_88100.S,v 1.5 2013/01/05 11:20:56 miod Exp $ */
+/* $OpenBSD: vectors_88100.S,v 1.6 2014/06/08 13:20:39 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1991, 1992 Carnegie Mellon University
@@ -78,8 +78,8 @@ GLOBAL(vector_list)
VECTOR(unknown_handler) /* 7d */
VECTOR(unimplemented_handler) /* 7e */
VECTOR(unknown_handler) /* 7f */
- VECTOR(syscall_handler) /* 80 */
- VECTOR(syscall_handler) /* 81 */
+ VECTOR(unknown_handler) /* 80 */
+ VECTOR(unknown_handler) /* 81 */
#ifdef DDB
VECTOR(break) /* 82 */
VECTOR(trace) /* 83 */
diff --git a/sys/arch/m88k/m88k/vectors_88110.S b/sys/arch/m88k/m88k/vectors_88110.S
index e094d1f6440..856e2852f2d 100644
--- a/sys/arch/m88k/m88k/vectors_88110.S
+++ b/sys/arch/m88k/m88k/vectors_88110.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: vectors_88110.S,v 1.7 2013/01/05 11:20:56 miod Exp $ */
+/* $OpenBSD: vectors_88110.S,v 1.8 2014/06/08 13:20:39 miod Exp $ */
/*
* Mach Operating System
* Copyright (c) 1991, 1992 Carnegie Mellon University
@@ -78,8 +78,8 @@ GLOBAL(m88110_vector_list)
VECTOR(m88110_unknown_handler) /* 7d */
VECTOR(m88110_unimplemented_handler) /* 7e */
VECTOR(m88110_unknown_handler) /* 7f */
- VECTOR(m88110_syscall_handler) /* 80 */
- VECTOR(m88110_syscall_handler) /* 81 */
+ VECTOR(m88110_unknown_handler) /* 80 */
+ VECTOR(m88110_unknown_handler) /* 81 */
#ifdef DDB
VECTOR(m88110_break) /* 82 */
VECTOR(m88110_trace) /* 83 */