33d7e3ee78
Log:
```
commit feb47278d7cffa8cf4bc8c8ff78047126fa41e82 (HEAD -> dev, origin/dev, origin/HEAD)
Author: ngie-eign <1574099+ngie-eign@users.noreply.github.com>
Date: Fri Mar 22 10:51:04 2019 -0700
Remove `FAIL` macro use for non-x86 architectures when testing `sysarch(2)` (#38)
`FAIL()` does not support being called in the form noted in the test,
which causes a test failure on non-x86 architectures.
The alternatives (use `ADD_TEST_FAILURE()` or `GTEST_SKIP()`) would be
misleading (in both cases), and in the case of `GTEST_SKIP()` is unavailable
on the version of googletest packaged with capsicum-test.
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
commit 32ad0f3e4c11be7f7463d40eef8d4a78ac9f61a5
Author: Enji Cooper <yaneurabeya@gmail.com>
Date: Fri Mar 15 20:01:56 2019 -0700
Fix `-Wunused-parameter` issues
Remove variable declarations from functions/methods where the variable
is not required.
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
commit 9437b4c550110200ef190ac39fb26c1d8fc55d9a
Author: Enji Cooper <yaneurabeya@gmail.com>
Date: Fri Mar 15 19:59:00 2019 -0700
Fix `-Wshadow` issues with `EXPECT_OPEN_OK(..)` macro
* Wrap in do-while(0) block to avoid variable shadowing issue with
multiple calls in the same function.
* Prefix block local variables with `_` to try and avoid variable
name clashes with values local to test methods.
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
commit adf4a21a233b5da5cac440f4006e258ffba09510
Author: Enji Cooper <yaneurabeya@gmail.com>
Date: Fri Mar 15 19:55:00 2019 -0700
Fix `-Wmissing-variable-declarations` issue with `known_rights` global
Staticize it since it is only used in the file.
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
```
This merges a number of the outstanding changes made locally to
^/projects/capsicum-test that were accepted into the upstream project.
The sync was done like so:
```
curl -L https://github.com/google/capsicum-test/tarball/dd7eac98c0cf | tar --strip-components=1 -xvzf - -C dist/
rm -Rf dist/*/
```
1. https://github.com/google/capsicum-test
260 lines
8.4 KiB
C
260 lines
8.4 KiB
C
/*
|
|
* Minimal portability layer for system call differences between
|
|
* Capsicum OSes.
|
|
*/
|
|
#ifndef __SYSCALLS_H__
|
|
#define __SYSCALLS_H__
|
|
|
|
/************************************************************
|
|
* FreeBSD
|
|
************************************************************/
|
|
#ifdef __FreeBSD__
|
|
|
|
/* Map umount2 (Linux) syscall to unmount (FreeBSD) syscall */
|
|
#define umount2(T, F) unmount(T, F)
|
|
|
|
/* Map sighandler_y (Linux) to sig_t (FreeBSD) */
|
|
#define sighandler_t sig_t
|
|
|
|
/* profil(2) has a first argument of char* */
|
|
#define profil_arg1_t char
|
|
|
|
/* FreeBSD has getdents(2) available */
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
inline int getdents_(unsigned int fd, void *dirp, unsigned int count) {
|
|
return getdents(fd, (char*)dirp, count);
|
|
}
|
|
#include <sys/mman.h>
|
|
inline int mincore_(void *addr, size_t length, unsigned char *vec) {
|
|
return mincore(addr, length, (char*)vec);
|
|
}
|
|
#define getpid_ getpid
|
|
|
|
/* Map Linux-style sendfile to FreeBSD sendfile */
|
|
#include <sys/socket.h>
|
|
#include <sys/uio.h>
|
|
inline ssize_t sendfile_(int out_fd, int in_fd, off_t *offset, size_t count) {
|
|
return sendfile(in_fd, out_fd, *offset, count, NULL, offset, 0);
|
|
}
|
|
|
|
/* A sample mount(2) call */
|
|
#include <sys/param.h>
|
|
#include <sys/mount.h>
|
|
inline int bogus_mount_() {
|
|
return mount("procfs", "/not_mounted", 0, NULL);
|
|
}
|
|
|
|
/* Mappings for extended attribute functions */
|
|
#include <sys/extattr.h>
|
|
inline ssize_t flistxattr_(int fd, char *list, size_t size) {
|
|
return extattr_list_fd(fd, EXTATTR_NAMESPACE_USER, list, size);
|
|
}
|
|
inline ssize_t fgetxattr_(int fd, const char *name, void *value, size_t size) {
|
|
return extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, name, value, size);
|
|
}
|
|
inline int fsetxattr_(int fd, const char *name, const void *value, size_t size, int) {
|
|
return extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, name, value, size);
|
|
}
|
|
inline int fremovexattr_(int fd, const char *name) {
|
|
return extattr_delete_fd(fd, EXTATTR_NAMESPACE_USER, name);
|
|
}
|
|
|
|
/* mq_* functions are wrappers in FreeBSD so go through to underlying syscalls */
|
|
#include <sys/syscall.h>
|
|
extern "C" {
|
|
extern int __sys_kmq_notify(int, const struct sigevent *);
|
|
extern int __sys_kmq_open(const char *, int, mode_t, const struct mq_attr *);
|
|
extern int __sys_kmq_setattr(int, const struct mq_attr *__restrict, struct mq_attr *__restrict);
|
|
extern ssize_t __sys_kmq_timedreceive(int, char *__restrict, size_t,
|
|
unsigned *__restrict, const struct timespec *__restrict);
|
|
extern int __sys_kmq_timedsend(int, const char *, size_t, unsigned,
|
|
const struct timespec *);
|
|
extern int __sys_kmq_unlink(const char *);
|
|
}
|
|
#define mq_notify_ __sys_kmq_notify
|
|
#define mq_open_ __sys_kmq_open
|
|
#define mq_setattr_ __sys_kmq_setattr
|
|
#define mq_getattr_(A, B) __sys_kmq_setattr(A, NULL, B)
|
|
#define mq_timedreceive_ __sys_kmq_timedreceive
|
|
#define mq_timedsend_ __sys_kmq_timedsend
|
|
#define mq_unlink_ __sys_kmq_unlink
|
|
#define mq_close_ close
|
|
#include <sys/ptrace.h>
|
|
inline long ptrace_(int request, pid_t pid, void *addr, void *data) {
|
|
return ptrace(request, pid, (caddr_t)addr, static_cast<int>((long)data));
|
|
}
|
|
#define PTRACE_PEEKDATA_ PT_READ_D
|
|
#define getegid_ getegid
|
|
#define getgid_ getgid
|
|
#define geteuid_ geteuid
|
|
#define getuid_ getuid
|
|
#define getgroups_ getgroups
|
|
#define getrlimit_ getrlimit
|
|
#define bind_ bind
|
|
#define connect_ connect
|
|
|
|
/* Features available */
|
|
#if __FreeBSD_version >= 1000000
|
|
#define HAVE_CHFLAGSAT
|
|
#define HAVE_BINDAT
|
|
#define HAVE_CONNECTAT
|
|
#endif
|
|
#define HAVE_CHFLAGS
|
|
#define HAVE_GETFSSTAT
|
|
#define HAVE_REVOKE
|
|
#define HAVE_GETLOGIN
|
|
#define HAVE_MKFIFOAT
|
|
#define HAVE_SYSARCH
|
|
#include <machine/sysarch.h>
|
|
#define HAVE_STAT_BIRTHTIME
|
|
#define HAVE_SYSCTL
|
|
#define HAVE_FPATHCONF
|
|
#define HAVE_F_DUP2FD
|
|
#define HAVE_PSELECT
|
|
#define HAVE_SCTP
|
|
|
|
/* FreeBSD only allows root to call mlock[all]/munlock[all] */
|
|
#define MLOCK_REQUIRES_ROOT 1
|
|
/* FreeBSD effectively only allows root to call sched_setscheduler */
|
|
#define SCHED_SETSCHEDULER_REQUIRES_ROOT 1
|
|
|
|
#endif /* FreeBSD */
|
|
|
|
/************************************************************
|
|
* Linux
|
|
************************************************************/
|
|
#ifdef __linux__
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <sys/prctl.h>
|
|
#include <sys/syscall.h>
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include <sys/resource.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/sendfile.h>
|
|
#include <sys/statfs.h>
|
|
#include <sys/xattr.h>
|
|
#include <sys/mount.h>
|
|
#include <linux/net.h>
|
|
|
|
/* profil(2) has a first argument of unsigned short* */
|
|
#define profil_arg1_t unsigned short
|
|
|
|
static inline int getdents_(unsigned int fd, void *dirp, unsigned int count) {
|
|
return syscall(__NR_getdents, fd, dirp, count);
|
|
}
|
|
/* A sample mount(2) call */
|
|
static inline int bogus_mount_() {
|
|
return mount("/dev/bogus", "/bogus", "debugfs", MS_RDONLY, "");
|
|
}
|
|
|
|
/* libc's getpid() wrapper caches the pid value, and doesn't invalidate
|
|
* the cached value on pdfork(), so directly syscall. */
|
|
static inline pid_t getpid_() {
|
|
return syscall(__NR_getpid);
|
|
}
|
|
static inline int execveat(int fd, const char *path,
|
|
char *const argv[], char *const envp[], int flags) {
|
|
return syscall(__NR_execveat, fd, path, argv, envp, flags);
|
|
}
|
|
|
|
/*
|
|
* Linux glibc includes an fexecve() function, implemented via the /proc
|
|
* filesystem. Bypass this and go directly to the execveat(2) syscall.
|
|
*/
|
|
static inline int fexecve_(int fd, char *const argv[], char *const envp[]) {
|
|
return execveat(fd, "", argv, envp, AT_EMPTY_PATH);
|
|
}
|
|
/*
|
|
* Linux glibc attempts to be clever and intercepts various uid/gid functions.
|
|
* Bypass by calling the syscalls directly.
|
|
*/
|
|
static inline gid_t getegid_(void) { return syscall(__NR_getegid); }
|
|
static inline gid_t getgid_(void) { return syscall(__NR_getgid); }
|
|
static inline uid_t geteuid_(void) { return syscall(__NR_geteuid); }
|
|
static inline uid_t getuid_(void) { return syscall(__NR_getuid); }
|
|
static inline int getgroups_(int size, gid_t list[]) { return syscall(__NR_getgroups, size, list); }
|
|
static inline int getrlimit_(int resource, struct rlimit *rlim) {
|
|
return syscall(__NR_getrlimit, resource, rlim);
|
|
}
|
|
|
|
/*
|
|
* Linux glibc for i386 consumes the errno returned from the raw socketcall(2) operation,
|
|
* so use the raw syscall for those operations that are disallowed in capability mode.
|
|
*/
|
|
#ifdef __NR_bind
|
|
#define bind_ bind
|
|
#else
|
|
static inline int bind_(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
|
|
unsigned long args[3] = {(unsigned long)sockfd, (unsigned long)(intptr_t)addr, (unsigned long)addrlen};
|
|
return syscall(__NR_socketcall, SYS_BIND, args);
|
|
}
|
|
#endif
|
|
#ifdef __NR_connect
|
|
#define connect_ connect
|
|
#else
|
|
static inline int connect_(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
|
|
unsigned long args[3] = {(unsigned long)sockfd, (unsigned long)(intptr_t)addr, (unsigned long)addrlen};
|
|
return syscall(__NR_socketcall, SYS_CONNECT, args);
|
|
}
|
|
#endif
|
|
|
|
#define mincore_ mincore
|
|
#define sendfile_ sendfile
|
|
#define flistxattr_ flistxattr
|
|
#define fgetxattr_ fgetxattr
|
|
#define fsetxattr_ fsetxattr
|
|
#define fremovexattr_ fremovexattr
|
|
#define mq_notify_ mq_notify
|
|
#define mq_open_ mq_open
|
|
#define mq_setattr_ mq_setattr
|
|
#define mq_getattr_ mq_getattr
|
|
#define mq_timedreceive_ mq_timedreceive
|
|
#define mq_timedsend_ mq_timedsend
|
|
#define mq_unlink_ mq_unlink
|
|
#define mq_close_ mq_close
|
|
#define ptrace_ ptrace
|
|
#define PTRACE_PEEKDATA_ PTRACE_PEEKDATA
|
|
|
|
/* Features available */
|
|
#define HAVE_DUP3
|
|
#define HAVE_PIPE2
|
|
#include <sys/fsuid.h> /* for setfsgid()/setfsuid() */
|
|
#define HAVE_SETFSUID
|
|
#define HAVE_SETFSGID
|
|
#define HAVE_READAHEAD
|
|
#define HAVE_SEND_RECV_MMSG
|
|
#define HAVE_SYNCFS
|
|
#define HAVE_SYNC_FILE_RANGE
|
|
#include <sys/uio.h> /* for vmsplice */
|
|
#define HAVE_TEE
|
|
#define HAVE_SPLICE
|
|
#define HAVE_VMSPLICE
|
|
#define HAVE_PSELECT
|
|
#define HAVE_PPOLL
|
|
#define HAVE_EXECVEAT
|
|
#define HAVE_SYSCALL
|
|
#define HAVE_MKNOD_REG
|
|
#define HAVE_MKNOD_SOCKET
|
|
/*
|
|
* O_BENEATH is arch-specific, via <asm/fcntl.h>; however we cannot include both that file
|
|
* and the normal <fcntl.h> as they have some clashing definitions. Bypass by directly
|
|
* defining O_BENEATH, using the current proposed x86 value. (This will therefore not
|
|
* work for non-x86, and may need changing in future if a different value gets merged.)
|
|
*/
|
|
#ifndef O_BENEATH
|
|
#define O_BENEATH 040000000 /* no / or .. in openat path */
|
|
#endif
|
|
|
|
|
|
/* Linux allows anyone to call mlock[all]/munlock[all] */
|
|
#define MLOCK_REQUIRES_ROOT 0
|
|
/* Linux allows anyone to call sched_setscheduler */
|
|
#define SCHED_SETSCHEDULER_REQUIRES_ROOT 1
|
|
|
|
#endif /* Linux */
|
|
|
|
#endif /*__SYSCALLS_H__*/
|