From bd6ccce32ad42483a51c3147691f13b152c28593 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 29 Mar 2024 06:48:04 +0000
Subject: [PATCH] the msyscall(2) manual page can be deleted. Also, the details
 described in sigaltstack(2) are no longer true. ok jmc

---
 lib/libc/sys/Makefile.inc  |  4 +--
 lib/libc/sys/msyscall.2    | 72 --------------------------------------
 lib/libc/sys/sigaltstack.2 | 11 +++---
 3 files changed, 6 insertions(+), 81 deletions(-)
 delete mode 100644 lib/libc/sys/msyscall.2

diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index e833a28924c..ff0ca6dc558 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.177 2024/01/19 14:15:51 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.178 2024/03/29 06:48:04 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -189,7 +189,7 @@ MAN+=	__get_tcb.2 __thrsigdivert.2 __thrsleep.2 _exit.2 accept.2 \
 	intro.2 ioctl.2 issetugid.2 \
 	kbind.2 kill.2 kqueue.2 ktrace.2 link.2 listen.2 lseek.2 madvise.2 \
 	mimmutable.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 \
-	mlockall.2 mmap.2 mount.2 mprotect.2 mquery.2 msyscall.2 msgctl.2 \
+	mlockall.2 mmap.2 mount.2 mprotect.2 mquery.2 msgctl.2 \
 	msgget.2 msgrcv.2 msgsnd.2 msync.2 munmap.2 nanosleep.2 \
 	nfssvc.2 open.2 pathconf.2 pinsyscalls.2 pipe.2 pledge.2 \
 	poll.2 profil.2 ptrace.2 quotactl.2 read.2 readlink.2 reboot.2 recv.2 \
diff --git a/lib/libc/sys/msyscall.2 b/lib/libc/sys/msyscall.2
deleted file mode 100644
index 451402a30fe..00000000000
--- a/lib/libc/sys/msyscall.2
+++ /dev/null
@@ -1,72 +0,0 @@
-.\"	$OpenBSD: msyscall.2,v 1.3 2023/09/14 19:59:12 jmc Exp $
-.\"
-.\" Copyright (c) 2019 Theo de Raadt <deraadt@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: September 14 2023 $
-.Dt MSYSCALL 2
-.Os
-.Sh NAME
-.Nm msyscall
-.Nd permit syscalls from a region of pages
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn msyscall "void *addr" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn msyscall
-system call permits system call entry from the pages that contain
-the address range
-.Fa addr
-through
-.Fa addr
-\&+
-.Fa len
-\- 1
-(inclusive).
-If
-.Fa len
-is 0, no action is taken on the page that contains
-.Fa addr .
-.Pp
-.Fn msyscall
-is currently intended for use by
-.Xr ld.so 1
-only, and may be called only once to indicate the location of
-the loaded
-.Pa libc.so
-library.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-.Fn msyscall
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The specified address range would wrap around.
-.It Bq Er EPERM
-Attempt to call
-.Fn msyscall
-after
-.Xr ld.so 1
-has called it.
-.El
-.Sh SEE ALSO
-.Xr mmap 2
-.Sh HISTORY
-The
-.Fn msyscall
-function first appeared in
-.Ox 6.7 .
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index 99819c2068f..cb042c49faa 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigaltstack.2,v 1.26 2022/10/19 18:29:36 deraadt Exp $
+.\"	$OpenBSD: sigaltstack.2,v 1.27 2024/03/29 06:48:04 deraadt Exp $
 .\"	$NetBSD: sigaltstack.2,v 1.3 1995/02/27 10:41:52 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1992, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)sigaltstack.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: October 19 2022 $
+.Dd $Mdocdate: March 29 2024 $
 .Dt SIGALTSTACK 2
 .Os
 .Sh NAME
@@ -132,11 +132,8 @@ On
 some additional restrictions prevent dangerous address space modifications.
 The proposed space at
 .Fa ss_sp
-is verified to be contiguously mapped for read-write permissions
-(no execute)
-and incapable of syscall entry
-(see
-.Xr msyscall 2 ) .
+is verified to be contiguously mapped for read-write permissions without
+execute.
 If those conditions are met, a page-aligned inner region will be freshly mapped
 (all zero) with
 .Dv MAP_STACK
-- 
2.20.1