Index: head/libexec/rtld-elf/rtld-libc/libc_private.h =================================================================== --- head/libexec/rtld-elf/rtld-libc/libc_private.h (revision 349554) +++ head/libexec/rtld-elf/rtld-libc/libc_private.h (revision 349555) @@ -1,39 +1,39 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright 2019 Alex Richadson + * Copyright 2019 Alex Richardson * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory (Department of Computer Science and * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the * DARPA SSITH research programme. * * 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 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 AUTHOR 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. * * $FreeBSD$ */ #ifndef _RTLD_LIBC_PRIVATE_H_ #define _RTLD_LIBC_PRIVATE_H_ #include "rtld_libc.h" #endif /* _RTLD_LIBC_PRIVATE_H_ */ Index: head/libexec/rtld-elf/rtld-libc/namespace.h =================================================================== --- head/libexec/rtld-elf/rtld-libc/namespace.h (revision 349554) +++ head/libexec/rtld-elf/rtld-libc/namespace.h (revision 349555) @@ -1,39 +1,39 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright 2019 Alex Richadson + * Copyright 2019 Alex Richardson * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory (Department of Computer Science and * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the * DARPA SSITH research programme. * * 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 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 AUTHOR 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. * * $FreeBSD$ */ #define fcntl _fcntl #define open _open #define openat _openat #define fstatfs _fstatfs #define close _close #define getdirentries _getdirentries Index: head/libexec/rtld-elf/rtld-libc/rtld_libc.c =================================================================== --- head/libexec/rtld-elf/rtld-libc/rtld_libc.c (revision 349554) +++ head/libexec/rtld-elf/rtld-libc/rtld_libc.c (revision 349555) @@ -1,140 +1,140 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright 2019 Alex Richadson + * Copyright 2019 Alex Richardson * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory (Department of Computer Science and * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the * DARPA SSITH research programme. * * 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 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 AUTHOR 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. * * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include #include #include "rtld.h" #include "rtld_printf.h" #include "rtld_libc.h" /* * Avoid dependencies from various libc calls on abort(). Since this is only * used for assertions in RTLD, we can just raise SIGABRT directly. */ void abort(void) { raise(SIGABRT); __builtin_trap(); } static int rtld_errno; int *__error(void); int * __error(void) { return (&rtld_errno); } /* Avoid dependency on __libc_interposing, use the system call directly. */ #undef sigprocmask int sigprocmask(int how, const sigset_t *set, sigset_t *oset) { return (__sys_sigprocmask(how, set, oset)); } __strong_reference(sigprocmask, __libc_sigprocmask); #if defined DEBUG || !defined(NDEBUG) /* Provide an implementation of __assert that does not pull in fprintf() */ void __assert(const char *func, const char *file, int line, const char *failedexpr) { if (func == NULL) (void)rtld_fdprintf(STDERR_FILENO, "Assertion failed: (%s), file %s, line %d.\n", failedexpr, file, line); else (void)rtld_fdprintf(STDERR_FILENO, "Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line); abort(); /* NOTREACHED */ } #endif /* * Avoid pulling in all of pthreads from getpagesize(). * It normally uses libc/gen/auxv.c which pulls in pthread_once(). */ int getpagesize(void) { int mib[2], value; size_t size; static int pagesize; if (pagesize != 0) return (pagesize); if (npagesizes > 0) pagesize = pagesizes[0]; if (pagesize == 0) { mib[0] = CTL_HW; mib[1] = HW_PAGESIZE; size = sizeof(value); if (sysctl(mib, nitems(mib), &value, &size, NULL, 0) == -1) pagesize = PAGE_SIZE; else pagesize = value; } return (pagesize); } extern int __sys___sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp, const void *newp, size_t newlen); int sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp, const void *newp, size_t newlen) { int retval; assert(name[0] != CTL_USER && "Not supported inside rtld!"); retval = __sys___sysctl(name, namelen, oldp, oldlenp, newp, newlen); return (retval); } Index: head/libexec/rtld-elf/rtld-libc/rtld_libc.h =================================================================== --- head/libexec/rtld-elf/rtld-libc/rtld_libc.h (revision 349554) +++ head/libexec/rtld-elf/rtld-libc/rtld_libc.h (revision 349555) @@ -1,89 +1,89 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright 2019 Alex Richadson + * Copyright 2019 Alex Richardson * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory (Department of Computer Science and * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the * DARPA SSITH research programme. * * 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 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 AUTHOR 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. * * $FreeBSD$ */ #ifndef _RTLD_AVOID_LIBC_DEPS_H_ #define _RTLD_AVOID_LIBC_DEPS_H_ #include #include #include #include /* Avoid dependencies on libthr (used by closedir/opendir/readdir) */ #define __isthreaded 0 #define _pthread_mutex_lock(mtx) (void)0 #define _pthread_mutex_unlock(mtx) (void)0 #define _pthread_mutex_destroy(mtx) (void)0 #define __libc_interposing error, must not use this variable inside rtld int __sys_close(int); void __sys_exit(int) __dead2; int __sys_fcntl(int, int, ...); int __sys_fstat(int fd, struct stat *); int __sys_fstatat(int, const char *, struct stat *, int); int __sys___getcwd(char *, size_t); int __sys_open(const char *, int, ...); int __sys_openat(int, const char *, int, ...); int __sys_sigprocmask(int, const sigset_t *, sigset_t *); int __sys_thr_kill(long, int); int __sys_thr_self(long *); __ssize_t __sys_pread(int, void *, __size_t, __off_t); __ssize_t __sys_read(int, void *, __size_t); __ssize_t __sys_write(int, const void *, __size_t); extern char* __progname; const char *_getprogname(void); int __getosreldate(void); /* * Don't pull in any of the libc wrappers. Instead we use the system call * directly inside RTLD to avoid pulling in __libc_interposing (which pulls * in lots more object files). */ #define close(fd) __sys_close(fd) #define _close(fd) __sys_close(fd) #define exit(status) __sys_exit(status) #define _exit(status) __sys_exit(status) #define fcntl(fd, cmd, arg) __sys_fcntl(fd, cmd, arg) #define _fcntl(fd, cmd, arg) __sys_fcntl(fd, cmd, arg) #define _fstat(fd, sb) __sys_fstat(fd, sb) #define open(path, ...) __sys_open(path, __VA_ARGS__) #define pread(fd, buf, nbytes, offset) __sys_pread(fd, buf, nbytes, offset) #define read(fd, buf, nbytes) __sys_read(fd, buf, nbytes) #define sigprocmask(how, set, oset) __sys_sigprocmask(how, set, oset) #define strerror(errno) rtld_strerror(errno) #define _write(fd, buf, nbytes) __sys_write(fd, buf, nbytes) #define write(fd, buf, nbytes) __sys_write(fd, buf, nbytes) #endif /* _RTLD_AVOID_LIBC_DEPS_H_ */ Index: head/libexec/rtld-elf/rtld-libc/un-namespace.h =================================================================== --- head/libexec/rtld-elf/rtld-libc/un-namespace.h (revision 349554) +++ head/libexec/rtld-elf/rtld-libc/un-namespace.h (revision 349555) @@ -1,41 +1,41 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright 2019 Alex Richadson + * Copyright 2019 Alex Richardson * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory (Department of Computer Science and * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the * DARPA SSITH research programme. * * 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 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 AUTHOR 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. * * $FreeBSD$ */ #undef fcntl #undef open #undef openat #undef close #undef fstatfs #undef getdirentries #include "rtld_libc.h"