215baed16f
While looking at the disassembly for the epoll stuff I noticed that this expands to quite a lot of code that the compiler can't optimize out for LP64 (because it doesn't know that the "copy the argument into a local and then use the local" bit isn't important). There are two obvious options here. Something like this: ``` int signalfd64(int fd, const sigset64_t* mask, int flags) { return __signalfd4(fd, mask, sizeof(*mask), flags); } int signalfd(int fd, const sigset_t* mask, int flags) { #if defined(__LP64__) return signalfd64(fd, mask, flags); #else SigSetConverter set = {.sigset = *mask}; return signalfd64(fd, &set.sigset64, flags); #endif } ``` Or something like this: ``` int signalfd64(int fd, const sigset64_t* mask, int flags) { return __signalfd4(fd, mask, sizeof(*mask), flags); } #if defined(__LP64__) __strong_alias(signalfd, signalfd64); #else int signalfd(int fd, const sigset_t* mask, int flags) { SigSetConverter set = {}; set.sigset = *mask; return signalfd64(fd, &set.sigset64, flags); } #endif ``` The former is slightly more verbose, but seems a bit more obvious, so I initially went with that. (The former is more verbose in the generated code too, given that the latter expands to _no_ code, just another symbol pointing to the same code address.) Having done that, I realized that slight changes to the interface would let clang optimize away most/all of the overhead for LP64 with the only preprocessor hackery being in SigSetConverter itself. I also pulled out the legacy bsd `int` conversions since they're only used in two (secret!) functions, so it's clearer to just have a separate union for them. While doing so, I suppressed those functions for riscv64, since there's no reason to keep carrying that mistake forward. posix_spawn() is another simple case that doesn't actually benefit from SigSetConverter, so I've given that its own anonymous union too. Test: treehugger Change-Id: Iaf67486da40d40fc53ec69717c3492ab7ab81ad6
398 lines
13 KiB
C++
398 lines
13 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * 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 COPYRIGHT HOLDERS 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
|
|
* COPYRIGHT OWNER 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 <spawn.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <linux/close_range.h>
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/syscall.h>
|
|
#include <unistd.h>
|
|
|
|
#include <android/fdsan.h>
|
|
|
|
#include "private/ScopedSignalBlocker.h"
|
|
|
|
static int set_cloexec(int i) {
|
|
int v = fcntl(i, F_GETFD);
|
|
if (v == -1) return -1; // almost certainly: errno == EBADF
|
|
return fcntl(i, F_SETFD, v | FD_CLOEXEC);
|
|
}
|
|
|
|
// mark all open fds except stdin/out/err as close-on-exec
|
|
static int cloexec_except_stdioe() {
|
|
// requires 5.11+ or ACK 5.10-T kernel, otherwise returns ENOSYS or EINVAL
|
|
if (!close_range(3, ~0U, CLOSE_RANGE_CLOEXEC)) return 0;
|
|
|
|
// unfortunately getrlimit can lie:
|
|
// - both soft and hard limits can be lowered to 0, with fds still open, so it can underestimate
|
|
// - in practice it usually is some really large value (like 32K or more)
|
|
// even though only a handful of small fds are actually open (ie. < 500),
|
|
// this results in poor performance when trying to act on all possibly open fds
|
|
struct rlimit m;
|
|
int max = getrlimit(RLIMIT_NOFILE, &m) ? 1000000 : m.rlim_max;
|
|
for (int i = 3; i < max; ++i) set_cloexec(i);
|
|
return 0;
|
|
}
|
|
|
|
enum Action {
|
|
kOpen,
|
|
kClose,
|
|
kDup2,
|
|
kChdir,
|
|
kFchdir,
|
|
};
|
|
|
|
struct __posix_spawn_file_action {
|
|
__posix_spawn_file_action* next;
|
|
|
|
Action what;
|
|
int fd;
|
|
int new_fd;
|
|
char* path;
|
|
int flags;
|
|
mode_t mode;
|
|
|
|
void Do() {
|
|
if (what == kOpen) {
|
|
fd = open(path, flags, mode);
|
|
if (fd == -1) _exit(127);
|
|
// If it didn't land where we wanted it, move it.
|
|
if (fd != new_fd) {
|
|
if (dup2(fd, new_fd) == -1) _exit(127);
|
|
close(fd);
|
|
}
|
|
} else if (what == kClose) {
|
|
// Failure to close is ignored.
|
|
close(fd);
|
|
} else if (what == kChdir) {
|
|
if (chdir(path) == -1) _exit(127);
|
|
} else if (what == kFchdir) {
|
|
if (fchdir(fd) == -1) _exit(127);
|
|
} else {
|
|
// It's a dup2.
|
|
if (fd == new_fd) {
|
|
// dup2(2) is a no-op if fd == new_fd, but POSIX suggests that we should
|
|
// manually remove the O_CLOEXEC flag in that case (because otherwise
|
|
// what use is the dup?).
|
|
// See https://www.austingroupbugs.net/view.php?id=411 for details.
|
|
int flags = fcntl(fd, F_GETFD, 0);
|
|
if (flags == -1 || fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) == -1) _exit(127);
|
|
} else {
|
|
if (dup2(fd, new_fd) == -1) _exit(127);
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
struct __posix_spawn_file_actions {
|
|
__posix_spawn_file_action* head;
|
|
__posix_spawn_file_action* last;
|
|
|
|
void Do() {
|
|
for (__posix_spawn_file_action* action = head; action != nullptr; action = action->next) {
|
|
action->Do();
|
|
}
|
|
}
|
|
};
|
|
|
|
struct __posix_spawnattr {
|
|
short flags;
|
|
pid_t pgroup;
|
|
sched_param schedparam;
|
|
int schedpolicy;
|
|
union {
|
|
sigset_t sigset;
|
|
sigset64_t sigset64;
|
|
} sigmask, sigdefault;
|
|
};
|
|
|
|
static void ApplyAttrs(short flags, const posix_spawnattr_t* attr) {
|
|
// POSIX: "If POSIX_SPAWN_SETSIGDEF is set ... signals in sigdefault ...
|
|
// shall be set to their default actions in the child process."
|
|
// POSIX: "Signals set to be caught by the calling process shall be
|
|
// set to the default action in the child process."
|
|
bool use_sigdefault = ((flags & POSIX_SPAWN_SETSIGDEF) != 0);
|
|
const struct sigaction64 default_sa = { .sa_handler = SIG_DFL };
|
|
for (int s = 1; s < _NSIG; ++s) {
|
|
bool reset = false;
|
|
if (use_sigdefault && sigismember64(&(*attr)->sigdefault.sigset64, s)) {
|
|
reset = true;
|
|
} else {
|
|
struct sigaction64 current;
|
|
if (sigaction64(s, nullptr, ¤t) == -1) _exit(127);
|
|
reset = (current.sa_handler != SIG_IGN && current.sa_handler != SIG_DFL);
|
|
}
|
|
if (reset && sigaction64(s, &default_sa, nullptr) == -1) _exit(127);
|
|
}
|
|
|
|
if ((flags & POSIX_SPAWN_SETPGROUP) != 0 && setpgid(0, (*attr)->pgroup) == -1) _exit(127);
|
|
if ((flags & POSIX_SPAWN_SETSID) != 0 && setsid() == -1) _exit(127);
|
|
|
|
// POSIX_SPAWN_SETSCHEDULER overrides POSIX_SPAWN_SETSCHEDPARAM, but it is not an error
|
|
// to set both.
|
|
if ((flags & POSIX_SPAWN_SETSCHEDULER) != 0) {
|
|
if (sched_setscheduler(0, (*attr)->schedpolicy, &(*attr)->schedparam) == -1) _exit(127);
|
|
} else if ((flags & POSIX_SPAWN_SETSCHEDPARAM) != 0) {
|
|
if (sched_setparam(0, &(*attr)->schedparam) == -1) _exit(127);
|
|
}
|
|
|
|
if ((flags & POSIX_SPAWN_RESETIDS) != 0) {
|
|
if (seteuid(getuid()) == -1 || setegid(getgid()) == -1) _exit(127);
|
|
}
|
|
|
|
if ((flags & POSIX_SPAWN_SETSIGMASK) != 0) {
|
|
if (sigprocmask64(SIG_SETMASK, &(*attr)->sigmask.sigset64, nullptr)) _exit(127);
|
|
}
|
|
|
|
if ((flags & POSIX_SPAWN_CLOEXEC_DEFAULT) != 0) {
|
|
if (cloexec_except_stdioe()) _exit(127);
|
|
}
|
|
}
|
|
|
|
static int posix_spawn(pid_t* pid_ptr,
|
|
const char* path,
|
|
const posix_spawn_file_actions_t* actions,
|
|
const posix_spawnattr_t* attr,
|
|
char* const argv[],
|
|
char* const env[],
|
|
int exec_fn(const char* path, char* const argv[], char* const env[])) {
|
|
// See http://man7.org/linux/man-pages/man3/posix_spawn.3.html
|
|
// and http://pubs.opengroup.org/onlinepubs/9699919799/functions/posix_spawn.html
|
|
|
|
ScopedSignalBlocker ssb;
|
|
|
|
short flags = attr ? (*attr)->flags : 0;
|
|
bool use_vfork = ((flags & POSIX_SPAWN_USEVFORK) != 0) || (actions == nullptr && flags == 0);
|
|
|
|
pid_t pid = use_vfork ? vfork() : fork();
|
|
if (pid == -1) return errno;
|
|
|
|
if (pid == 0) {
|
|
// Child.
|
|
ApplyAttrs(flags, attr);
|
|
if (actions) (*actions)->Do();
|
|
if ((flags & POSIX_SPAWN_SETSIGMASK) == 0) ssb.reset();
|
|
exec_fn(path, argv, env ? env : environ);
|
|
_exit(127);
|
|
}
|
|
|
|
// Parent.
|
|
if (pid_ptr) *pid_ptr = pid;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawn(pid_t* pid, const char* path, const posix_spawn_file_actions_t* actions,
|
|
const posix_spawnattr_t* attr, char* const argv[], char* const env[]) {
|
|
return posix_spawn(pid, path, actions, attr, argv, env, execve);
|
|
}
|
|
|
|
int posix_spawnp(pid_t* pid, const char* file, const posix_spawn_file_actions_t* actions,
|
|
const posix_spawnattr_t* attr, char* const argv[], char* const env[]) {
|
|
return posix_spawn(pid, file, actions, attr, argv, env, execvpe);
|
|
}
|
|
|
|
int posix_spawnattr_init(posix_spawnattr_t* attr) {
|
|
*attr = reinterpret_cast<__posix_spawnattr*>(calloc(1, sizeof(__posix_spawnattr)));
|
|
return (*attr == nullptr) ? errno : 0;
|
|
}
|
|
|
|
int posix_spawnattr_destroy(posix_spawnattr_t* attr) {
|
|
free(*attr);
|
|
*attr = nullptr;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setflags(posix_spawnattr_t* attr, short flags) {
|
|
if ((flags & ~(POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSIGDEF |
|
|
POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER |
|
|
POSIX_SPAWN_USEVFORK | POSIX_SPAWN_SETSID | POSIX_SPAWN_CLOEXEC_DEFAULT)) != 0) {
|
|
return EINVAL;
|
|
}
|
|
(*attr)->flags = flags;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getflags(const posix_spawnattr_t* attr, short* flags) {
|
|
*flags = (*attr)->flags;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setpgroup(posix_spawnattr_t* attr, pid_t pgroup) {
|
|
(*attr)->pgroup = pgroup;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getpgroup(const posix_spawnattr_t* attr, pid_t* pgroup) {
|
|
*pgroup = (*attr)->pgroup;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setsigmask(posix_spawnattr_t* attr, const sigset_t* mask) {
|
|
(*attr)->sigmask.sigset = *mask;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setsigmask64(posix_spawnattr_t* attr, const sigset64_t* mask) {
|
|
(*attr)->sigmask.sigset64 = *mask;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getsigmask(const posix_spawnattr_t* attr, sigset_t* mask) {
|
|
*mask = (*attr)->sigmask.sigset;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getsigmask64(const posix_spawnattr_t* attr, sigset64_t* mask) {
|
|
*mask = (*attr)->sigmask.sigset64;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setsigdefault(posix_spawnattr_t* attr, const sigset_t* mask) {
|
|
(*attr)->sigdefault.sigset = *mask;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setsigdefault64(posix_spawnattr_t* attr, const sigset64_t* mask) {
|
|
(*attr)->sigdefault.sigset64 = *mask;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getsigdefault(const posix_spawnattr_t* attr, sigset_t* mask) {
|
|
*mask = (*attr)->sigdefault.sigset;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getsigdefault64(const posix_spawnattr_t* attr, sigset64_t* mask) {
|
|
*mask = (*attr)->sigdefault.sigset64;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setschedparam(posix_spawnattr_t* attr, const struct sched_param* param) {
|
|
(*attr)->schedparam = *param;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getschedparam(const posix_spawnattr_t* attr, struct sched_param* param) {
|
|
*param = (*attr)->schedparam;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_setschedpolicy(posix_spawnattr_t* attr, int policy) {
|
|
(*attr)->schedpolicy = policy;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawnattr_getschedpolicy(const posix_spawnattr_t* attr, int* policy) {
|
|
*policy = (*attr)->schedpolicy;
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawn_file_actions_init(posix_spawn_file_actions_t* actions) {
|
|
*actions = reinterpret_cast<__posix_spawn_file_actions*>(calloc(1, sizeof(**actions)));
|
|
return (*actions == nullptr) ? errno : 0;
|
|
}
|
|
|
|
int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t* actions) {
|
|
__posix_spawn_file_action* a = (*actions)->head;
|
|
while (a) {
|
|
__posix_spawn_file_action* last = a;
|
|
a = a->next;
|
|
free(last->path);
|
|
free(last);
|
|
}
|
|
free(*actions);
|
|
*actions = nullptr;
|
|
return 0;
|
|
}
|
|
|
|
static int posix_spawn_add_file_action(posix_spawn_file_actions_t* actions,
|
|
Action what,
|
|
int fd,
|
|
int new_fd,
|
|
const char* path,
|
|
int flags,
|
|
mode_t mode) {
|
|
__posix_spawn_file_action* action =
|
|
reinterpret_cast<__posix_spawn_file_action*>(malloc(sizeof(*action)));
|
|
if (action == nullptr) return errno;
|
|
|
|
action->next = nullptr;
|
|
if (what == kOpen || what == kChdir) {
|
|
action->path = strdup(path);
|
|
if (action->path == nullptr) {
|
|
free(action);
|
|
return errno;
|
|
}
|
|
} else {
|
|
action->path = nullptr;
|
|
}
|
|
action->what = what;
|
|
action->fd = fd;
|
|
action->new_fd = new_fd;
|
|
action->flags = flags;
|
|
action->mode = mode;
|
|
|
|
if ((*actions)->head == nullptr) {
|
|
(*actions)->head = (*actions)->last = action;
|
|
} else {
|
|
(*actions)->last->next = action;
|
|
(*actions)->last = action;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t* actions,
|
|
int fd, const char* path, int flags, mode_t mode) {
|
|
if (fd < 0) return EBADF;
|
|
return posix_spawn_add_file_action(actions, kOpen, -1, fd, path, flags, mode);
|
|
}
|
|
|
|
int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t* actions, int fd) {
|
|
if (fd < 0) return EBADF;
|
|
return posix_spawn_add_file_action(actions, kClose, fd, -1, nullptr, 0, 0);
|
|
}
|
|
|
|
int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t* actions, int fd, int new_fd) {
|
|
if (fd < 0 || new_fd < 0) return EBADF;
|
|
return posix_spawn_add_file_action(actions, kDup2, fd, new_fd, nullptr, 0, 0);
|
|
}
|
|
|
|
int posix_spawn_file_actions_addchdir_np(posix_spawn_file_actions_t* actions, const char* path) {
|
|
return posix_spawn_add_file_action(actions, kChdir, -1, -1, path, 0, 0);
|
|
}
|
|
|
|
int posix_spawn_file_actions_addfchdir_np(posix_spawn_file_actions_t* actions, int fd) {
|
|
if (fd < 0) return EBADF;
|
|
return posix_spawn_add_file_action(actions, kFchdir, fd, -1, nullptr, 0, 0);
|
|
}
|