Switch libc and ld.so to the generic stubs for these calls.
WARNING: reboot to updated kernel before installing libc or ld.so!
Time for a story...
When gcc (back in 1.x days) first implemented long long, it didn't (always)
pass 64bit arguments in 'aligned' registers/stack slots, with the result that
argument offsets didn't match structure offsets. This affected the nine system
calls that pass off_t arguments:
ftruncate lseek mmap mquery pread preadv pwrite pwritev truncate
To avoid having to do custom ASM wrappers for those, BSD put an explicit pad
argument in so that the off_t argument would always start on a even slot and
thus be naturally aligned. Thus those odd wrappers in lib/libc/sys/ that use
__syscall() and pass an extra '0' argument.
The ABIs for different CPUs eventually settled how things should be passed on
each and gcc 2.x followed them. The only arch now where it helps is landisk,
which needs to skip the last argument register if it would be the first half of
a 64bit argument. So: add new syscalls without the pad argument and on landisk
do that skipping directly in the syscall handler in the kernel. Keep compat
support for the existing syscalls long enough for the transition.
ok deraadt@
-# $OpenBSD: Makefile.inc,v 1.160 2021/06/11 10:29:33 kettenis Exp $
+# $OpenBSD: Makefile.inc,v 1.161 2021/12/23 18:50:32 guenther Exp $
# $NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/17/93
w_clock_gettime.c w_gettimeofday.c microtime.c
# glue for compat with old syscall interfaces.
-SRCS+= ftruncate.c lseek.c mquery.c mmap.c ptrace.c semctl.c truncate.c \
+SRCS+= ptrace.c semctl.c \
timer_create.c timer_delete.c timer_getoverrun.c timer_gettime.c \
- timer_settime.c pread.c preadv.c pwrite.c pwritev.c
+ timer_settime.c
# stack protector helper functions
SRCS+= stack_protector.c
msgrcv msgsnd msync \
nanosleep \
open openat \
- poll ppoll pselect \
+ poll ppoll pread preadv pselect pwrite pwritev \
read readv recvfrom recvmsg \
select sendmsg sendto \
wait4 write writev
-SRCS+= ${CANCEL:%=w_%.c} w_pread.c w_preadv.c w_pwrite.c w_pwritev.c
+SRCS+= ${CANCEL:%=w_%.c}
# modules with default implementations on all architectures, unless overridden
# below:
faccessat.o fchdir.o fchflags.o fchmod.o fchmodat.o fchown.o \
fchownat.o fhopen.o fhstat.o fhstatfs.o \
flock.o fpathconf.o fstat.o fstatat.o fstatfs.o \
- futex.o futimens.o futimes.o \
+ ftruncate.o futex.o futimens.o futimes.o \
getentropy.o getdents.o getfh.o getfsstat.o \
getgroups.o getitimer.o getpeername.o getpgid.o \
getpriority.o getresgid.o getresuid.o \
getrlimit.o getrusage.o getsid.o getsockname.o \
getsockopt.o ioctl.o \
kevent.o kill.o kqueue.o ktrace.o lchown.o \
- link.o linkat.o listen.o lstat.o madvise.o \
- minherit.o mkdir.o mkdirat.o mkfifo.o mkfifoat.o \
- mknod.o mknodat.o mlock.o mlockall.o mount.o mprotect.o \
- msgctl.o msgget.o munlock.o munlockall.o munmap.o \
+ link.o linkat.o listen.o lseek.o lstat.o \
+ madvise.o minherit.o mkdir.o mkdirat.o mkfifo.o mkfifoat.o \
+ mknod.o mknodat.o mlock.o mlockall.o mmap.o mount.o mprotect.o \
+ mquery.o msgctl.o msgget.o munlock.o munlockall.o munmap.o \
nfssvc.o \
pathconf.o pipe.o pipe2.o pledge.o profil.o \
quotactl.o \
settimeofday.o setuid.o shmat.o shmctl.o shmdt.o \
shmget.o shutdown.o sigaltstack.o socket.o \
socketpair.o stat.o statfs.o swapctl.o symlink.o symlinkat.o \
- sysarch.o sysctl.o thrkill.o unlink.o unlinkat.o \
+ sysarch.o sysctl.o \
+ thrkill.o truncate.o \
+ unlink.o unlinkat.o \
unmount.o unveil.o utimensat.o utimes.o utrace.o
SRCS+= ${SRCS_${MACHINE_CPU}}
+++ /dev/null
-/* $OpenBSD: ftruncate.c,v 1.17 2015/09/11 13:26:20 guenther Exp $ */
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-DEF_SYS(ftruncate);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-ftruncate(int fd, off_t length)
-{
- return (__syscall(SYS_ftruncate, fd, 0, length));
-}
-DEF_WEAK(ftruncate);
+++ /dev/null
-/* $OpenBSD: lseek.c,v 1.16 2015/09/11 13:26:20 guenther Exp $ */
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <unistd.h>
-
-off_t __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-DEF_SYS(lseek);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-off_t
-lseek(int fd, off_t offset, int whence)
-{
- return (__syscall(SYS_lseek, fd, 0, offset, whence));
-}
-DEF_WEAK(lseek);
+++ /dev/null
-/* $OpenBSD: mmap.c,v 1.16 2015/09/11 13:26:20 guenther Exp $ */
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-
-void *__syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-DEF_SYS(mmap);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-void *
-mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (__syscall(SYS_mmap, addr, len, prot, flags, fd, 0, offset));
-}
-DEF_WEAK(mmap);
+++ /dev/null
-/* $OpenBSD: mquery.c,v 1.8 2015/09/11 13:26:20 guenther Exp $ */
-/*
- * Written by Artur Grabowski <art@openbsd.org> Public Domain
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-
-void *__syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-DEF_SYS(mquery);
-
-/*
- * This function provides 64-bit offset padding.
- */
-void *
-mquery(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (__syscall(SYS_mquery, addr, len, prot, flags, fd, 0, offset));
-}
-DEF_WEAK(mquery);
+++ /dev/null
-/* $OpenBSD: pread.c,v 1.11 2016/05/07 19:05:22 guenther Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <unistd.h>
-
-ssize_t __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-
-DEF_SYS(pread);
-
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-HIDDEN(pread)(int fd, void *buf, size_t nbyte, off_t offset)
-{
- return (__syscall(SYS_pread, fd, buf, nbyte, 0, offset));
-}
+++ /dev/null
-/* $OpenBSD: preadv.c,v 1.11 2016/05/07 19:05:22 guenther Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/uio.h>
-
-ssize_t __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-
-DEF_SYS(preadv);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-HIDDEN(preadv)(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
-{
- return (__syscall(SYS_preadv, fd, iovp, iovcnt, 0, offset));
-}
+++ /dev/null
-/* $OpenBSD: pwrite.c,v 1.11 2016/05/07 19:05:22 guenther Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <unistd.h>
-
-ssize_t __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-
-DEF_SYS(pwrite);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-HIDDEN(pwrite)(int fd, const void *buf, size_t nbyte, off_t offset)
-{
- return (__syscall(SYS_pwrite, fd, buf, nbyte, 0, offset));
-}
+++ /dev/null
-/* $OpenBSD: pwritev.c,v 1.11 2016/05/07 19:05:22 guenther Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/uio.h>
-
-ssize_t __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-
-DEF_SYS(pwritev);
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-HIDDEN(pwritev)(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
-{
-
- return (__syscall(SYS_pwritev, fd, iovp, iovcnt, 0, offset));
-}
+++ /dev/null
-/* $OpenBSD: truncate.c,v 1.14 2015/09/11 13:26:20 guenther Exp $ */
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int __syscall(quad_t, ...);
-PROTO_NORMAL(__syscall);
-
-DEF_SYS(truncate);
-
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-truncate(const char *path, off_t length)
-{
- return (__syscall(SYS_truncate, path, 0, length));
-}
-DEF_WEAK(truncate);
-# $OpenBSD: Makefile,v 1.81 2021/06/26 14:46:48 kettenis Exp $
+# $OpenBSD: Makefile,v 1.82 2021/12/23 18:50:32 guenther Exp $
SUBDIR=ldconfig ldd
MAN= ld.so.1
SRCS+= dl_uname.c dl_dirname.c strlcat.c strlen.c trace.c
SRCS+= malloc.c reallocarray.c tib.c ffs.c
-syscall=__syscall close exit fstat getdents getentropy getthrid issetugid \
- mprotect munmap msyscall open pledge read __realpath sendsyslog \
+syscall=close exit fstat getdents getentropy getthrid issetugid kbind \
+ mmap mprotect munmap msyscall open pledge read __realpath sendsyslog \
__set_tcb sysctl thrkill utrace write
+.if (${MACHINE_ARCH} == "i386")
+syscall+=mquery
+SRCS+= library_mquery.c
+.else
+SRCS+= library.c
+.endif
+
GEN_PREFIX=\t.file "${@:R}.c"\n\#include "SYS.h"
.for _i in ${syscall}
OBJS+=dl_${_i}.o
${.TARGET:R}.d -o ${.TARGET}
.endfor
-.if (${MACHINE_ARCH} == "i386")
-SRCS+= library_mquery.c
-.else
-SRCS+= library.c
-.endif
-
.include "${.CURDIR}/${MACHINE_CPU}/Makefile.inc"
.PATH: ${.CURDIR}/${MACHINE_CPU}
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.8 2019/11/29 06:34:44 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.42 2019/11/29 06:34:44 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.29 2019/11/29 06:34:44 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.29 2019/11/29 06:34:44 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.29 2019/11/29 06:34:44 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.33 2019/11/29 06:34:44 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-static inline void *
-_dl_mquery(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mquery, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
-/* $OpenBSD: loader.c,v 1.193 2021/11/12 22:28:13 guenther Exp $ */
+/* $OpenBSD: loader.c,v 1.194 2021/12/23 18:50:32 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
if (_dl_bindnow) {
/* Lazy binding disabled, so disable kbind */
- _dl___syscall(SYS_kbind, (void *)NULL, (size_t)0, (long long)0);
+ _dl_kbind(NULL, 0, 0);
}
DL_DEB(("ld.so loading: '%s'\n", __progname));
-/* $OpenBSD: rtld_machine.c,v 1.29 2019/12/07 22:57:48 guenther Exp $ */
+/* $OpenBSD: rtld_machine.c,v 1.30 2021/12/23 18:50:32 guenther Exp $ */
/*
* Copyright (c) 2013 Miodrag Vallat.
#include "archdep.h"
#include "resolve.h"
+int _dl_cacheflush(unsigned long, size_t);
Elf_Addr _dl_bind(elf_object_t *object, int reloff);
void _dl_md_reloc_gotp_ent(Elf_Addr, Elf_Addr, Elf_Addr);
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.25 2019/11/29 06:34:45 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-int _dl_cacheflush(unsigned long, size_t);
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.31 2019/11/29 06:34:45 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.48 2019/11/29 06:34:45 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.1 2020/06/25 04:00:58 drahn Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.1 2021/04/28 15:16:26 drahn Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.28 2019/11/29 06:34:45 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
+++ /dev/null
-/* $OpenBSD: syscall.h,v 1.41 2019/11/29 06:34:45 deraadt Exp $ */
-
-/*
- * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#ifndef __DL_SYSCALL_H__
-#define __DL_SYSCALL_H__
-
-#include <sys/syscall.h>
-#include <sys/stat.h>
-
-#ifndef _dl_MAX_ERRNO
-#define _dl_MAX_ERRNO 512L
-#endif
-#define _dl_mmap_error(__res) \
- ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
-
-int _dl_close(int);
-__dead
-void _dl_exit(int);
-int _dl_fstat(int, struct stat *);
-ssize_t _dl_getdents(int, char *, size_t);
-int _dl_issetugid(void);
-int _dl_getthrid(void);
-int _dl_mprotect(const void *, size_t, int);
-int _dl_munmap(const void *, size_t);
-int _dl_open(const char *, int);
-int _dl_msyscall(void *addr, size_t len);
-ssize_t _dl_read(int, const char *, size_t);
-int _dl_pledge(const char *, const char **);
-long _dl___syscall(quad_t, ...);
-int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
-int _dl_utrace(const char *, const void *, size_t);
-int _dl_getentropy(char *, size_t);
-int _dl_sendsyslog(const char *, size_t, int);
-void _dl___set_tcb(void *);
-__dead
-void _dl_thrkill(pid_t, int, void *);
-
-static inline void *
-_dl_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- return (void *)_dl___syscall(SYS_mmap, addr, len, prot,
- flags, fd, 0, offset);
-}
-
-#endif /*__DL_SYSCALL_H__*/
--- /dev/null
+/* $OpenBSD: syscall.h,v 1.1 2021/12/23 18:50:32 guenther Exp $ */
+
+/*
+ * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#ifndef __DL_SYSCALL_H__
+#define __DL_SYSCALL_H__
+
+#include <sys/syscall.h>
+#include <sys/stat.h>
+
+#ifndef _dl_MAX_ERRNO
+#define _dl_MAX_ERRNO 512L
+#endif
+#define _dl_mmap_error(__res) \
+ ((long)__res < 0 && (long)__res >= -_dl_MAX_ERRNO)
+
+struct __kbind;
+
+int _dl_close(int);
+__dead
+void _dl_exit(int);
+int _dl_fstat(int, struct stat *);
+ssize_t _dl_getdents(int, char *, size_t);
+int _dl_getentropy(char *, size_t);
+int _dl_getthrid(void);
+int _dl_issetugid(void);
+int _dl_kbind(const struct __kbind *, size_t, int64_t);
+void *_dl_mmap(void *, size_t, int, int, int, off_t);
+int _dl_mprotect(const void *, size_t, int);
+void *_dl_mquery(void *, size_t, int, int, int, off_t);
+int _dl_msyscall(void *addr, size_t len);
+int _dl_munmap(const void *, size_t);
+int _dl_open(const char *, int);
+int _dl_pledge(const char *, const char **);
+ssize_t _dl_read(int, const char *, size_t);
+int _dl_sendsyslog(const char *, size_t, int);
+void _dl___set_tcb(void *);
+int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
+__dead
+void _dl_thrkill(pid_t, int, void *);
+int _dl_utrace(const char *, const void *, size_t);
+
+#endif /*__DL_SYSCALL_H__*/
-/* $OpenBSD: trap.c,v 1.155 2021/12/09 00:26:11 guenther Exp $ */
+/* $OpenBSD: trap.c,v 1.156 2021/12/23 18:50:32 guenther Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
case SYS_pwrite: i = 4; break;
case SYS_mquery:
case SYS_mmap: i = 6; break;
+#ifdef SYS_pad_lseek
+ case SYS_pad_lseek: retq = 0;
+ case SYS_pad_truncate:
+ case SYS_pad_ftruncate: i = 2; break;
+ case SYS_pad_preadv:
+ case SYS_pad_pwritev:
+ case SYS_pad_pread:
+ case SYS_pad_pwrite: i = 4; break;
+ case SYS_pad_mquery:
+ case SYS_pad_mmap: i = 6; break;
+#endif
}
if (i) {
-/* $OpenBSD: trap.c,v 1.49 2021/12/09 00:26:11 guenther Exp $ */
+/* $OpenBSD: trap.c,v 1.50 2021/12/23 18:50:32 guenther Exp $ */
/* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */
/* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */
caddr_t params;
const struct sysent *callp;
int error, opc;
- size_t argsize;
- register_t code, args[8], rval[2], ocode;
+ int argoff, argsize;
+ register_t code, args[8], rval[2];
uvmexp.syscalls++;
opc = tf->tf_spc;
- ocode = code = tf->tf_r0;
+ code = tf->tf_r0;
params = (caddr_t)tf->tf_r15;
* Code is first argument, followed by actual args.
*/
code = tf->tf_r4;
+ argoff = 1;
break;
case SYS___syscall:
/*
#else
code = tf->tf_r4;
#endif
+ argoff = 2;
break;
default:
+ argoff = 0;
break;
}
}
#endif
- switch (ocode) {
- case SYS_syscall:
- if (argsize) {
- args[0] = tf->tf_r5;
- args[1] = tf->tf_r6;
- args[2] = tf->tf_r7;
- if (argsize > 3 * sizeof(int)) {
- argsize -= 3 * sizeof(int);
- if ((error = copyin(params, &args[3],
- argsize)))
- goto bad;
- }
+ if (argsize) {
+ register_t *ap;
+ int off_t_arg;
+
+ switch (code) {
+ default: off_t_arg = 0; break;
+ case SYS_lseek:
+ case SYS_truncate:
+ case SYS_ftruncate: off_t_arg = 1; break;
+ case SYS_preadv:
+ case SYS_pwritev:
+ case SYS_pread:
+ case SYS_pwrite: off_t_arg = 3; break;
}
- break;
- case SYS___syscall:
- if (argsize) {
- args[0] = tf->tf_r6;
- args[1] = tf->tf_r7;
- if (argsize > 2 * sizeof(int)) {
- argsize -= 2 * sizeof(int);
- if ((error = copyin(params, &args[2],
- argsize)))
- goto bad;
- }
+
+ ap = args;
+ switch (argoff) {
+ case 0: *ap++ = tf->tf_r4; argsize -= sizeof(int);
+ case 1: *ap++ = tf->tf_r5; argsize -= sizeof(int);
+ case 2: *ap++ = tf->tf_r6; argsize -= sizeof(int);
+ /*
+ * off_t args aren't split between register
+ * and stack, but rather r7 is skipped and
+ * the entire off_t is on the stack.
+ */
+ if (argoff + off_t_arg == 3)
+ break;
+ *ap++ = tf->tf_r7; argsize -= sizeof(int);
+ break;
}
- break;
- default:
- if (argsize) {
- args[0] = tf->tf_r4;
- args[1] = tf->tf_r5;
- args[2] = tf->tf_r6;
- args[3] = tf->tf_r7;
- if (argsize > 4 * sizeof(int)) {
- argsize -= 4 * sizeof(int);
- if ((error = copyin(params, &args[4],
- argsize)))
- goto bad;
- }
+
+ if (argsize > 0) {
+ if ((error = copyin(params, ap, argsize)))
+ goto bad;
}
- break;
}
rval[0] = 0;
-/* $OpenBSD: kern_ktrace.c,v 1.104 2020/09/13 09:48:39 claudio Exp $ */
+/* $OpenBSD: kern_ktrace.c,v 1.105 2021/12/23 18:50:32 guenther Exp $ */
/* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */
/*
else if (code == SYS_lseek)
/* the one exception: lseek on ILP32 needs more */
len = sizeof(long long);
+#if 1
+ else if (code == SYS_pad_lseek)
+ len = sizeof(long long);
+#endif
else
len = sizeof(register_t);
ktrwrite2(p, &kth, &ktp, sizeof(ktp), retval, len);
-/* $OpenBSD: kern_pledge.c,v 1.276 2021/11/15 17:14:51 deraadt Exp $ */
+/* $OpenBSD: kern_pledge.c,v 1.277 2021/12/23 18:50:32 guenther Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
[SYS_lseek] = PLEDGE_STDIO,
[SYS_fpathconf] = PLEDGE_STDIO,
+#if 1
+ [SYS_pad_mquery] = PLEDGE_STDIO,
+ [SYS_pad_mmap] = PLEDGE_STDIO,
+ [SYS_pad_pread] = PLEDGE_STDIO,
+ [SYS_pad_preadv] = PLEDGE_STDIO,
+ [SYS_pad_pwrite] = PLEDGE_STDIO,
+ [SYS_pad_pwritev] = PLEDGE_STDIO,
+ [SYS_pad_ftruncate] = PLEDGE_STDIO,
+ [SYS_pad_lseek] = PLEDGE_STDIO,
+ [SYS_pad_truncate] = PLEDGE_WPATH,
+#endif
+
/*
* Address selection required a network pledge ("inet",
* "unix", "dns".
-; $OpenBSD: syscalls.master,v 1.220 2021/11/29 16:30:30 mvs Exp $
+; $OpenBSD: syscalls.master,v 1.221 2021/12/23 18:50:31 guenther Exp $
; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
struct sigaction *osa); }
47 STD NOLOCK { gid_t sys_getgid(void); }
48 STD NOLOCK { int sys_sigprocmask(int how, sigset_t mask); }
-49 OBSOL ogetlogin
+49 STD { void *sys_mmap(void *addr, size_t len, int prot, \
+ int flags, int fd, off_t pos); }
50 STD { int sys_setlogin(const char *namebuf); }
#ifdef ACCOUNTING
51 STD { int sys_acct(const char *path); }
const struct timeval *tptr); }
77 STD { int sys_futimes(int fd, \
const struct timeval *tptr); }
-78 UNIMPL mincore
+78 STD { void *sys_mquery(void *addr, size_t len, int prot, \
+ int flags, int fd, off_t pos); }
79 STD NOLOCK { int sys_getgroups(int gidsetsize, \
gid_t *gidset); }
80 STD { int sys_setgroups(int gidsetsize, \
163 OBSOL osetdomainname
164 STD { int sys___tmpfd(int flags); }
165 STD { int sys_sysarch(int op, void *parms); }
-166 UNIMPL
-167 UNIMPL
-168 UNIMPL
-169 OBSOL semsys10
-170 OBSOL msgsys10
-171 OBSOL shmsys10
-172 UNIMPL
-173 STD NOLOCK { ssize_t sys_pread(int fd, void *buf, \
+166 STD NOLOCK { off_t sys_lseek(int fd, off_t offset, int whence); }
+167 STD { int sys_truncate(const char *path, off_t length); }
+168 STD { int sys_ftruncate(int fd, off_t length); }
+169 STD NOLOCK { ssize_t sys_pread(int fd, void *buf, \
+ size_t nbyte, off_t offset); }
+170 STD NOLOCK { ssize_t sys_pwrite(int fd, const void *buf, \
+ size_t nbyte, off_t offset); }
+171 STD NOLOCK { ssize_t sys_preadv(int fd, \
+ const struct iovec *iovp, int iovcnt, \
+ off_t offset); }
+172 STD NOLOCK { ssize_t sys_pwritev(int fd, \
+ const struct iovec *iovp, int iovcnt, \
+ off_t offset); }
+173 STD NOLOCK { ssize_t sys_pad_pread(int fd, void *buf, \
size_t nbyte, int pad, off_t offset); }
-174 STD NOLOCK { ssize_t sys_pwrite(int fd, const void *buf, \
+174 STD NOLOCK { ssize_t sys_pad_pwrite(int fd, const void *buf, \
size_t nbyte, int pad, off_t offset); }
175 UNIMPL ntp_gettime
176 UNIMPL ntp_adjtime
195 STD NOLOCK { int sys_setrlimit(int which, \
const struct rlimit *rlp); }
196 OBSOL ogetdirentries48
-197 STD { void *sys_mmap(void *addr, size_t len, int prot, \
+197 STD { void *sys_pad_mmap(void *addr, size_t len, int prot, \
int flags, int fd, long pad, off_t pos); }
198 INDIR { quad_t sys___syscall(quad_t num, ...); }
-199 STD NOLOCK { off_t sys_lseek(int fd, int pad, off_t offset, \
+199 STD NOLOCK { off_t sys_pad_lseek(int fd, int pad, off_t offset, \
int whence); }
-200 STD { int sys_truncate(const char *path, int pad, \
+200 STD { int sys_pad_truncate(const char *path, int pad, \
off_t length); }
-201 STD { int sys_ftruncate(int fd, int pad, off_t length); }
+201 STD { int sys_pad_ftruncate(int fd, int pad, off_t length); }
202 STD { int sys_sysctl(const int *name, u_int namelen, \
void *old, size_t *oldlenp, void *new, \
size_t newlen); }
264 STD { int sys_fhopen(const fhandle_t *fhp, int flags); }
265 UNIMPL
266 UNIMPL
-267 STD NOLOCK { ssize_t sys_preadv(int fd, \
+267 STD NOLOCK { ssize_t sys_pad_preadv(int fd, \
const struct iovec *iovp, int iovcnt, \
int pad, off_t offset); }
-268 STD NOLOCK { ssize_t sys_pwritev(int fd, \
+268 STD NOLOCK { ssize_t sys_pad_pwritev(int fd, \
const struct iovec *iovp, int iovcnt, \
int pad, off_t offset); }
269 STD NOLOCK { int sys_kqueue(void); }
284 STD { int sys_setresgid(gid_t rgid, gid_t egid, \
gid_t sgid); }
285 OBSOL sys_omquery
-286 STD { void *sys_mquery(void *addr, size_t len, int prot, \
- int flags, int fd, long pad, off_t pos); }
+286 STD { void *sys_pad_mquery(void *addr, size_t len, \
+ int prot, int flags, int fd, long pad, \
+ off_t pos); }
287 STD NOLOCK { int sys_closefrom(int fd); }
288 STD { int sys_sigaltstack(const struct sigaltstack *nss, \
struct sigaltstack *oss); }
-/* $OpenBSD: vfs_syscalls.c,v 1.353 2021/10/02 14:05:10 semarie Exp $ */
+/* $OpenBSD: vfs_syscalls.c,v 1.354 2021/12/23 18:50:31 guenther Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */
/*
{
struct sys_lseek_args /* {
syscallarg(int) fd;
- syscallarg(int) pad;
syscallarg(off_t) offset;
syscallarg(int) whence;
} */ *uap = v;
return (error);
}
+#if 1
+int
+sys_pad_lseek(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_lseek_args *uap = v;
+ struct sys_lseek_args unpad;
+
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, offset) = SCARG(uap, offset);
+ SCARG(&unpad, whence) = SCARG(uap, whence);
+ return sys_lseek(p, &unpad, retval);
+}
+#endif
+
/*
* Check access permissions.
*/
{
struct sys_truncate_args /* {
syscallarg(const char *) path;
- syscallarg(int) pad;
syscallarg(off_t) length;
} */ *uap = v;
struct vnode *vp;
{
struct sys_ftruncate_args /* {
syscallarg(int) fd;
- syscallarg(int) pad;
syscallarg(off_t) length;
} */ *uap = v;
struct vattr vattr;
return (error);
}
+#if 1
+int
+sys_pad_truncate(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_truncate_args *uap = v;
+ struct sys_truncate_args unpad;
+
+ SCARG(&unpad, path) = SCARG(uap, path);
+ SCARG(&unpad, length) = SCARG(uap, length);
+ return sys_truncate(p, &unpad, retval);
+}
+
+int
+sys_pad_ftruncate(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_ftruncate_args *uap = v;
+ struct sys_ftruncate_args unpad;
+
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, length) = SCARG(uap, length);
+ return sys_ftruncate(p, &unpad, retval);
+}
+#endif
+
/*
* Sync an open file.
*/
syscallarg(int) fd;
syscallarg(void *) buf;
syscallarg(size_t) nbyte;
- syscallarg(int) pad;
syscallarg(off_t) offset;
} */ *uap = v;
struct iovec iov;
syscallarg(int) fd;
syscallarg(const struct iovec *) iovp;
syscallarg(int) iovcnt;
- syscallarg(int) pad;
syscallarg(off_t) offset;
} */ *uap = v;
struct iovec aiov[UIO_SMALLIOV], *iov = NULL;
syscallarg(int) fd;
syscallarg(const void *) buf;
syscallarg(size_t) nbyte;
- syscallarg(int) pad;
syscallarg(off_t) offset;
} */ *uap = v;
struct iovec iov;
syscallarg(int) fd;
syscallarg(const struct iovec *) iovp;
syscallarg(int) iovcnt;
- syscallarg(int) pad;
syscallarg(off_t) offset;
} */ *uap = v;
struct iovec aiov[UIO_SMALLIOV], *iov = NULL;
iovec_free(iov, iovcnt);
return (error);
}
+
+#if 1
+int
+sys_pad_pread(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_pread_args *uap = v;
+ struct sys_pread_args unpad;
+
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, buf) = SCARG(uap, buf);
+ SCARG(&unpad, nbyte) = SCARG(uap, nbyte);
+ SCARG(&unpad, offset) = SCARG(uap, offset);
+ return sys_pread(p, &unpad, retval);
+}
+
+int
+sys_pad_preadv(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_preadv_args *uap = v;
+ struct sys_preadv_args unpad;
+
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, iovp) = SCARG(uap, iovp);
+ SCARG(&unpad, iovcnt) = SCARG(uap, iovcnt);
+ SCARG(&unpad, offset) = SCARG(uap, offset);
+ return sys_preadv(p, &unpad, retval);
+}
+
+int
+sys_pad_pwrite(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_pwrite_args *uap = v;
+ struct sys_pwrite_args unpad;
+
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, buf) = SCARG(uap, buf);
+ SCARG(&unpad, nbyte) = SCARG(uap, nbyte);
+ SCARG(&unpad, offset) = SCARG(uap, offset);
+ return sys_pwrite(p, &unpad, retval);
+}
+
+int
+sys_pad_pwritev(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_pwritev_args *uap = v;
+ struct sys_pwritev_args unpad;
+
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, iovp) = SCARG(uap, iovp);
+ SCARG(&unpad, iovcnt) = SCARG(uap, iovcnt);
+ SCARG(&unpad, offset) = SCARG(uap, offset);
+ return sys_pwritev(p, &unpad, retval);
+}
+#endif
-/* $OpenBSD: uvm_mmap.c,v 1.166 2021/12/10 05:34:42 guenther Exp $ */
+/* $OpenBSD: uvm_mmap.c,v 1.167 2021/12/23 18:50:32 guenther Exp $ */
/* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */
/*
syscallarg(int) prot;
syscallarg(int) flags;
syscallarg(int) fd;
- syscallarg(long) pad;
syscallarg(off_t) pos;
} */ *uap = v;
struct file *fp;
syscallarg(int) prot;
syscallarg(int) flags;
syscallarg(int) fd;
- syscallarg(long) pad;
syscallarg(off_t) pos;
} */ *uap = v;
vaddr_t addr;
return error;
}
+#if 1
+int
+sys_pad_mquery(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_mquery_args *uap = v;
+ struct sys_mquery_args unpad;
+
+ SCARG(&unpad, addr) = SCARG(uap, addr);
+ SCARG(&unpad, len) = SCARG(uap, len);
+ SCARG(&unpad, prot) = SCARG(uap, prot);
+ SCARG(&unpad, flags) = SCARG(uap, flags);
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, pos) = SCARG(uap, pos);
+ return sys_mquery(p, &unpad, retval);
+}
+
+int
+sys_pad_mmap(struct proc *p, void *v, register_t *retval)
+{
+ struct sys_pad_mmap_args *uap = v;
+ struct sys_mmap_args unpad;
+
+ SCARG(&unpad, addr) = SCARG(uap, addr);
+ SCARG(&unpad, len) = SCARG(uap, len);
+ SCARG(&unpad, prot) = SCARG(uap, prot);
+ SCARG(&unpad, flags) = SCARG(uap, flags);
+ SCARG(&unpad, fd) = SCARG(uap, fd);
+ SCARG(&unpad, pos) = SCARG(uap, pos);
+ return sys_mmap(p, &unpad, retval);
+}
+#endif
+
/*
* sys_msync: the msync system call (a front-end for flush)
*/
/* a NULL paramp disables the syscall for the process */
if (paramp == NULL) {
+ if (pr->ps_kbind_addr != 0)
+ sigexit(p, SIGILL);
pr->ps_kbind_addr = BOGO_PC;
return 0;
}
-/* $OpenBSD: kdump.c,v 1.144 2021/07/12 15:09:19 beck Exp $ */
+/* $OpenBSD: kdump.c,v 1.145 2021/12/23 18:50:32 guenther Exp $ */
/*-
* Copyright (c) 1988, 1993
#include <netdb.h>
#include <poll.h>
#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <vis.h>
#define Phexlonglong Phexlong
#define phexll NULL /* not actually used on LP64 */
+/* no padding before long long arguments, nor at end */
+#define PAD64 0
+#define END64 end_of_args
+
#else /* __LP64__ */
/* on ILP32, long long arguments are passed as two 32bit args */
return (0);
}
+/*
+ * Some ILP32 archs naturally align off_t arguments to 8byte boundaries
+ * Get the compiler to tell if this arch is one of them.
+ */
+struct padding_test {
+ int padtest_one;
+ off_t padtest_two;
+};
+#define PAD64 (offsetof(struct padding_test,padtest_two) == 8)
+#define END64 (PAD64 ? PASS_LONGLONG : end_of_args)
+
#endif /* __LP64__ */
static int (*long_formatters[])(long) = {
[SYS_nfssvc] = { Phexint, Pptr },
[SYS_getfh] = { Ppath, Pptr },
[SYS_sysarch] = { Pdecint, Pptr },
- [SYS_pread] = { Pfd, Pptr, Pbigsize, PAD, Poff_t },
- [SYS_pwrite] = { Pfd, Pptr, Pbigsize, PAD, Poff_t },
+ [SYS_pread] = { Pfd, Pptr, Pbigsize, Poff_t, END64 },
+ [SYS_pwrite] = { Pfd, Pptr, Pbigsize, Poff_t, END64 },
+#ifdef SYS_pad_pread
+ [SYS_pad_pread] = { Pfd, Pptr, Pbigsize, PAD, Poff_t },
+ [SYS_pad_pwrite] = { Pfd, Pptr, Pbigsize, PAD, Poff_t },
+#endif
[SYS_setgid] = { Gidname },
[SYS_setegid] = { Gidname },
[SYS_seteuid] = { Uidname },
[SYS_swapctl] = { Swapctlname, Pptr, Pdecint },
[SYS_getrlimit] = { Rlimitname, Pptr },
[SYS_setrlimit] = { Rlimitname, Pptr },
- [SYS_mmap] = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, PAD, Poff_t },
- [SYS_lseek] = { Pfd, PAD, Poff_t, Whencename },
- [SYS_truncate] = { Ppath, PAD, Poff_t },
- [SYS_ftruncate] = { Pfd, PAD, Poff_t },
+ [SYS_mmap] = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, Poff_t, END64 },
+ [SYS_lseek] = { Pfd, Poff_t, Whencename, END64 },
+ [SYS_truncate] = { Ppath, Poff_t, END64 },
+ [SYS_ftruncate] = { Pfd, Poff_t, END64 },
+#ifdef SYS_pad_mmap
+ [SYS_pad_mmap] = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, PAD, Poff_t },
+ [SYS_pad_lseek] = { Pfd, PAD, Poff_t, Whencename },
+ [SYS_pad_truncate] = { Ppath, PAD, Poff_t },
+ [SYS_pad_ftruncate] = { Pfd, PAD, Poff_t },
+#endif
[SYS_sysctl] = { Pptr, Pcount, Pptr, Pptr, Pptr, Psize },
[SYS_mlock] = { Pptr, Pbigsize },
[SYS_munlock] = { Pptr, Pbigsize },
[SYS_msync] = { Pptr, Pbigsize, Msyncflagsname },
[SYS_pipe] = { Pptr },
[SYS_fhopen] = { Pptr, Openflagsname },
- [SYS_preadv] = { Pfd, Pptr, Pcount, PAD, Poff_t },
- [SYS_pwritev] = { Pfd, Pptr, Pcount, PAD, Poff_t },
+ [SYS_preadv] = { Pfd, Pptr, Pcount, Poff_t, END64 },
+ [SYS_pwritev] = { Pfd, Pptr, Pcount, Poff_t, END64 },
+#ifdef SYS_pad_preadv
+ [SYS_pad_preadv] = { Pfd, Pptr, Pcount, PAD, Poff_t },
+ [SYS_pad_pwritev] = { Pfd, Pptr, Pcount, PAD, Poff_t },
+#endif
[SYS_mlockall] = { Mlockallname },
[SYS_getresuid] = { Pptr, Pptr, Pptr },
[SYS_setresuid] = { Uidname, Uidname, Uidname },
[SYS_getresgid] = { Pptr, Pptr, Pptr },
[SYS_setresgid] = { Gidname, Gidname, Gidname },
- [SYS_mquery] = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, PAD, Poff_t },
+ [SYS_mquery] = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, Poff_t, END64 },
+#ifdef SYS_pad_mquery
+ [SYS_pad_mquery] = { Pptr, Pbigsize, Mmapprotname, Mmapflagsname, Pfd, PAD, Poff_t },
+#endif
[SYS_closefrom] = { Pfd },
[SYS_sigaltstack] = { Pptr, Pptr },
[SYS_shmget] = { Pkey_t, Pbigsize, Semgetname },
} else if (ktr->ktr_code < nitems(scargs)) {
const formatter *fmts = scargs[ktr->ktr_code];
int fmt;
+ int arg = 0;
- while (narg && (fmt = *fmts) != 0) {
+ while (arg < narg && (fmt = *fmts) != 0) {
+ if (PAD64 && fmt == PASS_LONGLONG && (arg & 1))
+ goto skip;
if (sep)
putchar(sep);
sep = ',';
else if (long_formatters[-fmt](*ap))
sep = '\0';
fmts++;
+skip:
ap++;
- narg--;
+ arg++;
}
+ narg -= arg;
}
while (narg > 0) {
if (fancy) {
switch (code) {
case SYS_lseek:
+#ifdef SYS_pad_lseek
+ case SYS_pad_lseek:
+#endif
(void)printf("%lld", retll);
if (retll < 0 || retll > 9)
(void)printf("/%#llx", retll);
projects / openbsd / commitdiff