summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorOrion Hodson <oth@google.com>2018-09-07 03:30:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-09-07 03:30:35 -0700
commitbf7dac3f3d7910a7192e1612e03f527cb1565bf9 (patch)
treeb33f282a3ea237f280967c90dac3dfbc4fb81a29 /libc
parent94e787b83b04425f7af59621120445071bf89762 (diff)
parent3a1bae5cd84bcb8d655568aa9799dd5151791f51 (diff)
Merge "libc: Add membarrier to common seccomp allowed list" am: dca7d3fae5
am: 3a1bae5cd8 Change-Id: I5272122714ee2b5a9e57c14bb7c29bce0400b536
Diffstat (limited to 'libc')
-rw-r--r--libc/SECCOMP_WHITELIST_COMMON.TXT3
1 files changed, 3 insertions, 0 deletions
diff --git a/libc/SECCOMP_WHITELIST_COMMON.TXT b/libc/SECCOMP_WHITELIST_COMMON.TXT
index 60568e66d7..f6e9539600 100644
--- a/libc/SECCOMP_WHITELIST_COMMON.TXT
+++ b/libc/SECCOMP_WHITELIST_COMMON.TXT
@@ -59,6 +59,9 @@ int sigreturn:sigreturn(unsigned long __unused) arm,x86,mips
# already allowed.
ssize_t readlink:readlink(const char *path, char *buf, size_t bufsiz) arm,x86,x86_64,mips
+# Probed for and conditionally used by ART.
+int membarrier(int cmd, int flags) all
+
# Useful new syscalls which we don't yet use in bionic.
int sched_getattr(pid_t pid, struct sched_attr* attr, unsigned int flags) all
int sched_setattr(pid_t pid, struct sched_attr* attr, unsigned int size, unsigned int flags) all