diff options
author | Elliott Hughes <enh@google.com> | 2017-09-28 15:20:40 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2017-09-28 22:28:23 -0700 |
commit | 96510935697c2934427f0c14d0b153244e8cfb2b (patch) | |
tree | 9d24bda7e80bb8a633651fa7ca646fe757c070c8 | |
parent | 2e01f39c31e042482fbe10df79d8b2837ae79239 (diff) | |
download | android_bionic-96510935697c2934427f0c14d0b153244e8cfb2b.tar.gz android_bionic-96510935697c2934427f0c14d0b153244e8cfb2b.tar.bz2 android_bionic-96510935697c2934427f0c14d0b153244e8cfb2b.zip |
Run other maintenance scripts as part of the preupload hooks.
And get back up to date by actually running them...
Bug: N/A
Test: uploaded this
Change-Id: I54fec461190e8570929fdcbcbf2746ddd6a4b293
-rw-r--r-- | PREUPLOAD.cfg | 3 | ||||
-rw-r--r-- | libc/seccomp/arm64_global_policy.cpp | 4 | ||||
-rw-r--r-- | libc/seccomp/arm_global_policy.cpp | 102 | ||||
-rw-r--r-- | libc/seccomp/mips64_global_policy.cpp | 4 | ||||
-rw-r--r-- | libc/seccomp/mips_global_policy.cpp | 158 | ||||
-rw-r--r-- | libc/seccomp/x86_64_global_policy.cpp | 100 | ||||
-rw-r--r-- | libc/seccomp/x86_global_policy.cpp | 126 | ||||
-rw-r--r-- | libm/libm.arm.map | 2 | ||||
-rw-r--r-- | libm/libm.arm64.map | 2 | ||||
-rw-r--r-- | libm/libm.mips.map | 2 | ||||
-rw-r--r-- | libm/libm.mips64.map | 2 | ||||
-rw-r--r-- | libm/libm.x86.map | 2 | ||||
-rw-r--r-- | libm/libm.x86_64.map | 2 | ||||
-rwxr-xr-x | tools/update_seccomp.sh | 7 | ||||
-rwxr-xr-x | tools/update_syscalls.sh | 7 | ||||
-rwxr-xr-x | tools/update_version_scripts.sh | 7 |
16 files changed, 277 insertions, 253 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 7b533a472..f7c8fd762 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,2 +1,5 @@ [Hook Scripts] notice = tools/update_notice.sh +seccomp = tools/update_seccomp.sh +syscalls = tools/update_syscalls.sh +version_scripts = tools/update_version_scripts.sh diff --git a/libc/seccomp/arm64_global_policy.cpp b/libc/seccomp/arm64_global_policy.cpp index 1a138b790..e2c594ecc 100644 --- a/libc/seccomp/arm64_global_policy.cpp +++ b/libc/seccomp/arm64_global_policy.cpp @@ -5,12 +5,12 @@ #include "seccomp_bpfs.h" const sock_filter arm64_global_filter[] = { -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5, 0, 32), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 32), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 219, 15, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 101, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 43, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 19, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 18, 27, 26), //setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|getcwd +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 18, 27, 26), //io_setup|io_destroy|io_submit|io_cancel|io_getevents|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|getcwd BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 42, 26, 25), //eventfd2|epoll_create1|epoll_ctl|epoll_pwait|dup|dup3|fcntl|inotify_init1|inotify_add_watch|inotify_rm_watch|ioctl|ioprio_set|ioprio_get|flock|mknodat|mkdirat|unlinkat|symlinkat|linkat|renameat|umount2|mount|pivot_root BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 59, 1, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 58, 24, 23), //statfs|fstatfs|truncate|ftruncate|fallocate|faccessat|chdir|fchdir|chroot|fchmod|fchmodat|fchownat|fchown|openat|close diff --git a/libc/seccomp/arm_global_policy.cpp b/libc/seccomp/arm_global_policy.cpp index 2f9a12294..d7b5d7ef8 100644 --- a/libc/seccomp/arm_global_policy.cpp +++ b/libc/seccomp/arm_global_policy.cpp @@ -5,7 +5,7 @@ #include "seccomp_bpfs.h" const sock_filter arm_global_filter[] = { -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 132), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 130), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 168, 65, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 77, 33, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 45, 17, 0), @@ -13,88 +13,86 @@ BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 26, 9, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 19, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 10, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 8, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 7, 124, 123), //restart_syscall|exit|fork|read|write|open|close -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 9, 123, 122), //creat -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 13, 122, 121), //unlink|execve|chdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 7, 122, 121), //restart_syscall|exit|fork|read|write|open|close +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 9, 121, 120), //creat +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 13, 120, 119), //unlink|execve|chdir BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 24, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 22, 120, 119), //lseek|getpid|mount -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 25, 119, 118), //getuid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 22, 118, 117), //lseek|getpid|mount +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 25, 117, 116), //getuid BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 36, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 33, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 27, 116, 115), //ptrace -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 34, 115, 114), //access +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 27, 114, 113), //ptrace +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 34, 113, 112), //access BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 41, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 40, 113, 112), //sync|kill|rename|mkdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 44, 112, 111), //dup|pipe|times +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 40, 111, 110), //sync|kill|rename|mkdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 44, 110, 109), //dup|pipe|times BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 60, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 54, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 51, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 46, 108, 107), //brk -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 53, 107, 106), //acct|umount2 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 46, 106, 105), //brk +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 53, 105, 104), //acct|umount2 BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 57, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 56, 105, 104), //ioctl|fcntl -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 58, 104, 103), //setpgid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 56, 103, 102), //ioctl|fcntl +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 58, 102, 101), //setpgid BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 66, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 63, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 62, 101, 100), //umask|chroot -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 65, 100, 99), //dup2|getppid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 62, 99, 98), //umask|chroot +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 65, 98, 97), //dup2|getppid BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 74, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 68, 98, 97), //setsid|sigaction -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 76, 97, 96), //sethostname|setrlimit +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 68, 96, 95), //setsid|sigaction +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 76, 95, 94), //sethostname|setrlimit BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 116, 15, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 94, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 87, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 85, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 80, 92, 91), //getrusage|gettimeofday|settimeofday -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 86, 91, 90), //readlink +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 80, 90, 89), //getrusage|gettimeofday|settimeofday +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 86, 89, 88), //readlink BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 91, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 89, 89, 88), //swapon|reboot -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 93, 88, 87), //munmap|truncate +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 89, 87, 86), //swapon|reboot +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 93, 86, 85), //munmap|truncate BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 103, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 96, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 95, 85, 84), //fchmod -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 98, 84, 83), //getpriority|setpriority +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 95, 83, 82), //fchmod +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 98, 82, 81), //getpriority|setpriority BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 114, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 106, 82, 81), //syslog|setitimer|getitimer -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 115, 81, 80), //wait4 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 106, 80, 79), //syslog|setitimer|getitimer +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 115, 79, 78), //wait4 BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 131, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 124, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 118, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 117, 77, 76), //sysinfo -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 123, 76, 75), //fsync|sigreturn|clone|setdomainname|uname +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 117, 75, 74), //sysinfo +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 123, 74, 73), //fsync|sigreturn|clone|setdomainname|uname BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 128, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 126, 74, 73), //adjtimex|mprotect -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 130, 73, 72), //init_module|delete_module +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 126, 72, 71), //adjtimex|mprotect +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 130, 71, 70), //init_module|delete_module BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 138, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 136, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 134, 70, 69), //quotactl|getpgid|fchdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 137, 69, 68), //personality +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 134, 68, 67), //quotactl|getpgid|fchdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 137, 67, 66), //personality BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 150, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 149, 67, 66), //setfsuid|setfsgid|_llseek|getdents|_newselect|flock|msync|readv|writev|getsid|fdatasync -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 164, 66, 65), //mlock|munlock|mlockall|munlockall|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_yield|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|nanosleep|mremap -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 309, 33, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 248, 17, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 213, 9, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 190, 5, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 149, 65, 64), //setfsuid|setfsgid|_llseek|getdents|_newselect|flock|msync|readv|writev|getsid|fdatasync +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 164, 64, 63), //mlock|munlock|mlockall|munlockall|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_yield|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|nanosleep|mremap +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 309, 31, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 224, 15, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 199, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 183, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 172, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 169, 59, 58), //poll -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 182, 58, 57), //prctl|rt_sigreturn|rt_sigaction|rt_sigprocmask|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|pread64|pwrite64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 188, 57, 56), //getcwd|capget|capset|sigaltstack|sendfile -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 199, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 198, 55, 54), //vfork|ugetrlimit|mmap2|truncate64|ftruncate64|stat64|lstat64|fstat64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 212, 54, 53), //getuid32|getgid32|geteuid32|getegid32|setreuid32|setregid32|getgroups32|setgroups32|fchown32|setresuid32|getresuid32|setresgid32|getresgid32 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 219, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 217, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 215, 51, 50), //setuid32|setgid32 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 218, 50, 49), //getdents64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 224, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 222, 48, 47), //mincore|madvise|fcntl64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 243, 47, 46), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill|sendfile64|futex|sched_setaffinity|sched_getaffinity +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 169, 58, 57), //poll +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 182, 57, 56), //prctl|rt_sigreturn|rt_sigaction|rt_sigprocmask|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|pread64|pwrite64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 190, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 188, 55, 54), //getcwd|capget|capset|sigaltstack|sendfile +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 198, 54, 53), //vfork|ugetrlimit|mmap2|truncate64|ftruncate64|stat64|lstat64|fstat64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 217, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 213, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 212, 51, 50), //getuid32|getgid32|geteuid32|getegid32|setreuid32|setregid32|getgroups32|setgroups32|fchown32|setresuid32|getresuid32|setresgid32|getresgid32 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 215, 50, 49), //setuid32|setgid32 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 219, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 218, 48, 47), //getdents64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 222, 47, 46), //mincore|madvise|fcntl64 BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 280, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 256, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 250, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 249, 43, 42), //exit_group +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 249, 43, 42), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill|sendfile64|futex|sched_setaffinity|sched_getaffinity|io_setup|io_destroy|io_getevents|io_submit|io_cancel|exit_group BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 254, 42, 41), //epoll_create|epoll_ctl|epoll_wait|remap_file_pages BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 270, 1, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 269, 40, 39), //set_tid_address|timer_create|timer_settime|timer_gettime|timer_getoverrun|timer_delete|clock_settime|clock_gettime|clock_getres|clock_nanosleep|statfs64|fstatfs64|tgkill diff --git a/libc/seccomp/mips64_global_policy.cpp b/libc/seccomp/mips64_global_policy.cpp index 004eda2e5..04c13b312 100644 --- a/libc/seccomp/mips64_global_policy.cpp +++ b/libc/seccomp/mips64_global_policy.cpp @@ -59,9 +59,9 @@ BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5170, 36, 35), //init_module|delete_module BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5173, 35, 34), //quotactl BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5193, 34, 33), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5208, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5205, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5200, 1, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5198, 31, 30), //futex|sched_setaffinity|sched_getaffinity|cacheflush -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5206, 30, 29), //exit_group +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5206, 30, 29), //io_setup|io_destroy|io_getevents|io_submit|io_cancel|exit_group BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5209, 29, 28), //epoll_ctl BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5239, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5237, 3, 0), diff --git a/libc/seccomp/mips_global_policy.cpp b/libc/seccomp/mips_global_policy.cpp index b4fa23deb..103e544f8 100644 --- a/libc/seccomp/mips_global_policy.cpp +++ b/libc/seccomp/mips_global_policy.cpp @@ -5,93 +5,91 @@ #include "seccomp_bpfs.h" const sock_filter mips_global_filter[] = { -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4001, 0, 114), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4136, 57, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4066, 29, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4041, 15, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4001, 0, 112), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4131, 55, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4063, 27, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4036, 13, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4023, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4010, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4008, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4007, 107, 106), //exit|fork|read|write|open|close -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4009, 106, 105), //creat +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4007, 105, 104), //exit|fork|read|write|open|close +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4009, 104, 103), //creat BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4019, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4013, 104, 103), //unlink|execve|chdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4022, 103, 102), //lseek|getpid|mount +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4013, 102, 101), //unlink|execve|chdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4022, 101, 100), //lseek|getpid|mount BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4033, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4026, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4025, 100, 99), //setuid|getuid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4027, 99, 98), //ptrace -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4036, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4034, 97, 96), //access -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4040, 96, 95), //sync|kill|rename|mkdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4057, 7, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4049, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4045, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4044, 92, 91), //dup|pipe|times -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4048, 91, 90), //brk|setgid|getgid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4054, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4053, 89, 88), //geteuid|getegid|acct|umount2 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4056, 88, 87), //ioctl|fcntl -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4063, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4060, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4058, 85, 84), //setpgid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4062, 84, 83), //umask|chroot -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4065, 83, 82), //dup2|getppid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4103, 13, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4087, 7, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4074, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4070, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4068, 78, 77), //setsid|sigaction -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4072, 77, 76), //setreuid|setregid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4085, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4082, 75, 74), //sethostname|setrlimit|getrlimit|getrusage|gettimeofday|settimeofday|getgroups|setgroups -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4086, 74, 73), //readlink -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4094, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4090, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4089, 71, 70), //swapon|reboot -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4093, 70, 69), //mmap|munmap|truncate -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4098, 69, 68), //fchmod|fchown|getpriority|setpriority -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4124, 7, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4116, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4114, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4106, 65, 64), //syslog|setitimer|getitimer -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4115, 64, 63), //wait4 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4118, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4117, 62, 61), //sysinfo -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4123, 61, 60), //fsync|sigreturn|clone|setdomainname|uname -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4131, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4128, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4126, 58, 57), //adjtimex|mprotect -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4130, 57, 56), //init_module|delete_module -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4134, 56, 55), //quotactl|getpgid|fchdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4025, 98, 97), //setuid|getuid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4027, 97, 96), //ptrace +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4034, 96, 95), //access +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4054, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4045, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4041, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4040, 92, 91), //sync|kill|rename|mkdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4044, 91, 90), //dup|pipe|times +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4049, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4048, 89, 88), //brk|setgid|getgid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4053, 88, 87), //geteuid|getegid|acct|umount2 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4060, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4057, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4056, 85, 84), //ioctl|fcntl +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4058, 84, 83), //setpgid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4062, 83, 82), //umask|chroot +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4094, 13, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4085, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4070, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4066, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4065, 78, 77), //dup2|getppid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4068, 77, 76), //setsid|sigaction +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4074, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4072, 75, 74), //setreuid|setregid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4082, 74, 73), //sethostname|setrlimit|getrlimit|getrusage|gettimeofday|settimeofday|getgroups|setgroups +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4090, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4087, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4086, 71, 70), //readlink +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4089, 70, 69), //swapon|reboot +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4093, 69, 68), //mmap|munmap|truncate +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4118, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4114, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4103, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4098, 65, 64), //fchmod|fchown|getpriority|setpriority +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4106, 64, 63), //syslog|setitimer|getitimer +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4116, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4115, 62, 61), //wait4 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4117, 61, 60), //sysinfo +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4128, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4124, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4123, 58, 57), //fsync|sigreturn|clone|setdomainname|uname +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4126, 57, 56), //adjtimex|mprotect +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4130, 56, 55), //init_module|delete_module BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4248, 27, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4188, 13, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4169, 7, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4151, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4138, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4137, 50, 49), //personality -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4148, 49, 48), //setfsuid|setfsgid|_llseek|getdents|_newselect|flock|msync|readv|writev|cacheflush -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4154, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4153, 47, 46), //getsid|fdatasync -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4168, 46, 45), //mlock|munlock|mlockall|munlockall|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_yield|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|nanosleep|mremap -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4179, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4176, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4175, 43, 42), //bind|connect|getpeername|getsockname|getsockopt|listen -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4178, 42, 41), //recvfrom|recvmsg -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4187, 41, 40), //sendmsg|sendto|setsockopt|shutdown|socket|socketpair|setresuid|getresuid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4217, 7, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4203, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4190, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4189, 37, 36), //poll -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4202, 36, 35), //setresgid|getresgid|prctl|rt_sigreturn|rt_sigaction|rt_sigprocmask|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|pread64|pwrite64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4210, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4208, 34, 33), //getcwd|capget|capset|sigaltstack|sendfile -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4216, 33, 32), //mmap2|truncate64|ftruncate64|stat64|lstat64|fstat64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4246, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4222, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4221, 30, 29), //mincore|madvise|getdents64|fcntl64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4241, 29, 28), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill|sendfile64|futex|sched_setaffinity|sched_getaffinity -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4247, 28, 27), //exit_group +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4179, 13, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4154, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4138, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4136, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4134, 50, 49), //quotactl|getpgid|fchdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4137, 49, 48), //personality +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4151, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4148, 47, 46), //setfsuid|setfsgid|_llseek|getdents|_newselect|flock|msync|readv|writev|cacheflush +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4153, 46, 45), //getsid|fdatasync +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4176, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4169, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4168, 43, 42), //mlock|munlock|mlockall|munlockall|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_yield|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|nanosleep|mremap +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4175, 42, 41), //bind|connect|getpeername|getsockname|getsockopt|listen +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4178, 41, 40), //recvfrom|recvmsg +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4210, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4190, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4188, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4187, 37, 36), //sendmsg|sendto|setsockopt|shutdown|socket|socketpair|setresuid|getresuid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4189, 36, 35), //poll +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4203, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4202, 34, 33), //setresgid|getresgid|prctl|rt_sigreturn|rt_sigaction|rt_sigprocmask|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|pread64|pwrite64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4208, 33, 32), //getcwd|capget|capset|sigaltstack|sendfile +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4222, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4217, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4216, 30, 29), //mmap2|truncate64|ftruncate64|stat64|lstat64|fstat64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4221, 29, 28), //mincore|madvise|getdents64|fcntl64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4247, 28, 27), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill|sendfile64|futex|sched_setaffinity|sched_getaffinity|io_setup|io_destroy|io_getevents|io_submit|io_cancel|exit_group BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4316, 13, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4288, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4280, 3, 0), diff --git a/libc/seccomp/x86_64_global_policy.cpp b/libc/seccomp/x86_64_global_policy.cpp index 71be1c165..801d6c2c2 100644 --- a/libc/seccomp/x86_64_global_policy.cpp +++ b/libc/seccomp/x86_64_global_policy.cpp @@ -5,81 +5,83 @@ #include "seccomp_bpfs.h" const sock_filter x86_64_global_filter[] = { -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 86), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 88), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 175, 43, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 79, 21, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 35, 11, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 8, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 5, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 3, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 2, 79, 78), //read|write -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4, 78, 77), //close -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 6, 77, 76), //fstat +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 2, 81, 80), //read|write +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 4, 80, 79), //close +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 6, 79, 78), //fstat BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 32, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 24, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 21, 74, 73), //lseek|mmap|mprotect|munmap|brk|rt_sigaction|rt_sigprocmask|rt_sigreturn|ioctl|pread64|pwrite64|readv|writev -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 29, 73, 72), //sched_yield|mremap|msync|mincore|madvise -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 33, 72, 71), //dup +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 21, 76, 75), //lseek|mmap|mprotect|munmap|brk|rt_sigaction|rt_sigprocmask|rt_sigreturn|ioctl|pread64|pwrite64|readv|writev +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 29, 75, 74), //sched_yield|mremap|msync|mincore|madvise +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 33, 74, 73), //dup BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 58, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 44, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 38, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 37, 68, 67), //nanosleep|getitimer -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 43, 67, 66), //setitimer|getpid|sendfile|socket|connect -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 57, 66, 65), //sendto|recvfrom|sendmsg|recvmsg|shutdown|bind|listen|getsockname|getpeername|socketpair|setsockopt|getsockopt|clone +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 37, 70, 69), //nanosleep|getitimer +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 43, 69, 68), //setitimer|getpid|sendfile|socket|connect +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 57, 68, 67), //sendto|recvfrom|sendmsg|recvmsg|shutdown|bind|listen|getsockname|getpeername|socketpair|setsockopt|getsockopt|clone BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 72, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 64, 64, 63), //vfork|execve|exit|wait4|kill|uname -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 78, 63, 62), //fcntl|flock|fsync|fdatasync|truncate|ftruncate +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 64, 66, 65), //vfork|execve|exit|wait4|kill|uname +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 78, 65, 64), //fcntl|flock|fsync|fdatasync|truncate|ftruncate BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 137, 11, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 95, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 93, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 91, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 82, 58, 57), //getcwd|chdir|fchdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 92, 57, 56), //fchmod -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 94, 56, 55), //fchown +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 82, 60, 59), //getcwd|chdir|fchdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 92, 59, 58), //fchmod +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 94, 58, 57), //fchown BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 135, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 112, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 111, 53, 52), //umask|gettimeofday|getrlimit|getrusage|sysinfo|times|ptrace|getuid|syslog|getgid|setuid|setgid|geteuid|getegid|setpgid|getppid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 132, 52, 51), //setsid|setreuid|setregid|getgroups|setgroups|setresuid|getresuid|setresgid|getresgid|getpgid|setfsuid|setfsgid|getsid|capget|capset|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|sigaltstack -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 136, 51, 50), //personality +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 111, 55, 54), //umask|gettimeofday|getrlimit|getrusage|sysinfo|times|ptrace|getuid|syslog|getgid|setuid|setgid|geteuid|getegid|setpgid|getppid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 132, 54, 53), //setsid|setreuid|setregid|getgroups|setgroups|setresuid|getresuid|setresgid|getresgid|getpgid|setfsuid|setfsgid|getsid|capget|capset|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|sigaltstack +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 136, 53, 52), //personality BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 157, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 155, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 140, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 139, 47, 46), //statfs|fstatfs -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 153, 46, 45), //getpriority|setpriority|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|mlock|munlock|mlockall|munlockall -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 156, 45, 44), //pivot_root +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 139, 49, 48), //statfs|fstatfs +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 153, 48, 47), //getpriority|setpriority|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|mlock|munlock|mlockall|munlockall +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 156, 47, 46), //pivot_root BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 169, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 168, 43, 42), //prctl|arch_prctl|adjtimex|setrlimit|chroot|sync|acct|settimeofday|mount|umount2|swapon -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 172, 42, 41), //reboot|sethostname|setdomainname -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 262, 21, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 233, 11, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 168, 45, 44), //prctl|arch_prctl|adjtimex|setrlimit|chroot|sync|acct|settimeofday|mount|umount2|swapon +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 172, 44, 43), //reboot|sethostname|setdomainname +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 257, 21, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 221, 11, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 202, 5, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 186, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 179, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 177, 36, 35), //init_module|delete_module -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 180, 35, 34), //quotactl -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 201, 34, 33), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 221, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 217, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 205, 31, 30), //futex|sched_setaffinity|sched_getaffinity -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 220, 30, 29), //getdents64|set_tid_address|restart_syscall -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 232, 29, 28), //fadvise64|timer_create|timer_settime|timer_gettime|timer_getoverrun|timer_delete|clock_settime|clock_gettime|clock_getres|clock_nanosleep|exit_group -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 254, 5, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 250, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 247, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 235, 25, 24), //epoll_ctl|tgkill -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 249, 24, 23), //waitid|add_key +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 177, 38, 37), //init_module|delete_module +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 180, 37, 36), //quotactl +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 201, 36, 35), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 217, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 206, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 205, 33, 32), //futex|sched_setaffinity|sched_getaffinity +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 211, 32, 31), //io_setup|io_destroy|io_getevents|io_submit|io_cancel +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 220, 31, 30), //getdents64|set_tid_address|restart_syscall +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 250, 5, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 247, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 233, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 232, 27, 26), //fadvise64|timer_create|timer_settime|timer_gettime|timer_getoverrun|timer_delete|clock_settime|clock_gettime|clock_getres|clock_nanosleep|exit_group +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 235, 26, 25), //epoll_ctl|tgkill +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 249, 25, 24), //waitid|add_key +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 254, 1, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 253, 23, 22), //keyctl|ioprio_set|ioprio_get -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 257, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 256, 21, 20), //inotify_add_watch|inotify_rm_watch -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 261, 20, 19), //openat|mkdirat|mknodat|fchownat -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 302, 9, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 283, 5, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 280, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 275, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 273, 15, 14), //newfstatat|unlinkat|renameat|linkat|symlinkat|readlinkat|fchmodat|faccessat|pselect6|ppoll|unshare -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 279, 14, 13), //splice|tee|sync_file_range|vmsplice -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 282, 13, 12), //utimensat|epoll_pwait -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 285, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 256, 22, 21), //inotify_add_watch|inotify_rm_watch +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 302, 11, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 280, 5, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 275, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 262, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 261, 17, 16), //openat|mkdirat|mknodat|fchownat +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 273, 16, 15), //newfstatat|unlinkat|renameat|linkat|symlinkat|readlinkat|fchmodat|faccessat|pselect6|ppoll|unshare +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 279, 15, 14), //splice|tee|sync_file_range|vmsplice +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 285, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 283, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 282, 12, 11), //utimensat|epoll_pwait BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 284, 11, 10), //timerfd_create BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 300, 10, 9), //fallocate|timerfd_settime|timerfd_gettime|accept4|signalfd4|eventfd2|epoll_create1|dup3|pipe2|inotify_init1|preadv|pwritev|rt_tgsigqueueinfo|perf_event_open|recvmmsg BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 322, 5, 0), diff --git a/libc/seccomp/x86_global_policy.cpp b/libc/seccomp/x86_global_policy.cpp index 36f488433..9305729b1 100644 --- a/libc/seccomp/x86_global_policy.cpp +++ b/libc/seccomp/x86_global_policy.cpp @@ -5,109 +5,111 @@ #include "seccomp_bpfs.h" const sock_filter x86_global_filter[] = { -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 118), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 0, 0, 120), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 136, 59, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 66, 29, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 41, 15, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 24, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 10, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 8, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 7, 111, 110), //restart_syscall|exit|fork|read|write|open|close -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 9, 110, 109), //creat +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 7, 113, 112), //restart_syscall|exit|fork|read|write|open|close +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 9, 112, 111), //creat BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 19, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 13, 108, 107), //unlink|execve|chdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 22, 107, 106), //lseek|getpid|mount +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 13, 110, 109), //unlink|execve|chdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 22, 109, 108), //lseek|getpid|mount BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 33, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 26, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 25, 104, 103), //getuid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 27, 103, 102), //ptrace +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 25, 106, 105), //getuid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 27, 105, 104), //ptrace BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 36, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 34, 101, 100), //access -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 40, 100, 99), //sync|kill|rename|mkdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 34, 103, 102), //access +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 40, 102, 101), //sync|kill|rename|mkdir BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 57, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 51, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 45, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 44, 96, 95), //dup|pipe|times -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 46, 95, 94), //brk +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 44, 98, 97), //dup|pipe|times +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 46, 97, 96), //brk BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 54, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 53, 93, 92), //acct|umount2 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 56, 92, 91), //ioctl|fcntl +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 53, 95, 94), //acct|umount2 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 56, 94, 93), //ioctl|fcntl BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 63, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 60, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 58, 89, 88), //setpgid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 62, 88, 87), //umask|chroot -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 65, 87, 86), //dup2|getppid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 58, 91, 90), //setpgid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 62, 90, 89), //umask|chroot +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 65, 89, 88), //dup2|getppid BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 102, 15, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 87, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 77, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 74, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 68, 82, 81), //setsid|sigaction -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 76, 81, 80), //sethostname|setrlimit +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 68, 84, 83), //setsid|sigaction +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 76, 83, 82), //sethostname|setrlimit BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 85, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 80, 79, 78), //getrusage|gettimeofday|settimeofday -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 86, 78, 77), //readlink +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 80, 81, 80), //getrusage|gettimeofday|settimeofday +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 86, 80, 79), //readlink BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 94, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 90, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 89, 75, 74), //swapon|reboot -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 93, 74, 73), //mmap|munmap|truncate +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 89, 77, 76), //swapon|reboot +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 93, 76, 75), //mmap|munmap|truncate BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 96, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 95, 72, 71), //fchmod -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 98, 71, 70), //getpriority|setpriority +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 95, 74, 73), //fchmod +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 98, 73, 72), //getpriority|setpriority BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 124, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 116, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 114, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 106, 67, 66), //socketcall|syslog|setitimer|getitimer -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 115, 66, 65), //wait4 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 106, 69, 68), //socketcall|syslog|setitimer|getitimer +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 115, 68, 67), //wait4 BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 118, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 117, 64, 63), //sysinfo -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 123, 63, 62), //fsync|sigreturn|clone|setdomainname|uname +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 117, 66, 65), //sysinfo +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 123, 65, 64), //fsync|sigreturn|clone|setdomainname|uname BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 131, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 128, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 126, 60, 59), //adjtimex|mprotect -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 130, 59, 58), //init_module|delete_module -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 134, 58, 57), //quotactl|getpgid|fchdir -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 286, 29, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 126, 62, 61), //adjtimex|mprotect +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 130, 61, 60), //init_module|delete_module +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 134, 60, 59), //quotactl|getpgid|fchdir +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 284, 29, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 213, 15, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 172, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 150, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 138, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 137, 52, 51), //personality -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 149, 51, 50), //setfsuid|setfsgid|_llseek|getdents|_newselect|flock|msync|readv|writev|getsid|fdatasync +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 137, 54, 53), //personality +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 149, 53, 52), //setfsuid|setfsgid|_llseek|getdents|_newselect|flock|msync|readv|writev|getsid|fdatasync BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 168, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 164, 49, 48), //mlock|munlock|mlockall|munlockall|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_yield|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|nanosleep|mremap -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 169, 48, 47), //poll +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 164, 51, 50), //mlock|munlock|mlockall|munlockall|sched_setparam|sched_getparam|sched_setscheduler|sched_getscheduler|sched_yield|sched_get_priority_max|sched_get_priority_min|sched_rr_get_interval|nanosleep|mremap +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 169, 50, 49), //poll BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 190, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 183, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 182, 45, 44), //prctl|rt_sigreturn|rt_sigaction|rt_sigprocmask|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|pread64|pwrite64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 188, 44, 43), //getcwd|capget|capset|sigaltstack|sendfile +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 182, 47, 46), //prctl|rt_sigreturn|rt_sigaction|rt_sigprocmask|rt_sigpending|rt_sigtimedwait|rt_sigqueueinfo|rt_sigsuspend|pread64|pwrite64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 188, 46, 45), //getcwd|capget|capset|sigaltstack|sendfile BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 199, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 198, 42, 41), //vfork|ugetrlimit|mmap2|truncate64|ftruncate64|stat64|lstat64|fstat64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 212, 41, 40), //getuid32|getgid32|geteuid32|getegid32|setreuid32|setregid32|getgroups32|setgroups32|fchown32|setresuid32|getresuid32|setresgid32|getresgid32 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 254, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 198, 44, 43), //vfork|ugetrlimit|mmap2|truncate64|ftruncate64|stat64|lstat64|fstat64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 212, 43, 42), //getuid32|getgid32|geteuid32|getegid32|setreuid32|setregid32|getgroups32|setgroups32|fchown32|setresuid32|getresuid32|setresgid32|getresgid32 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 252, 7, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 224, 3, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 218, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 215, 37, 36), //setuid32|setgid32 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 222, 36, 35), //mincore|madvise|getdents64|fcntl64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 252, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 244, 34, 33), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill|sendfile64|futex|sched_setaffinity|sched_getaffinity|set_thread_area -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 253, 33, 32), //exit_group -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 284, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 272, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 271, 30, 29), //epoll_create|epoll_ctl|epoll_wait|remap_file_pages|set_tid_address|timer_create|timer_settime|timer_gettime|timer_getoverrun|timer_delete|clock_settime|clock_gettime|clock_getres|clock_nanosleep|statfs64|fstatfs64|tgkill -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 273, 29, 28), //fadvise64_64 -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 285, 28, 27), //waitid -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 322, 13, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 300, 7, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 291, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 288, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 287, 23, 22), //add_key +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 215, 39, 38), //setuid32|setgid32 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 222, 38, 37), //mincore|madvise|getdents64|fcntl64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 245, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 244, 36, 35), //gettid|readahead|setxattr|lsetxattr|fsetxattr|getxattr|lgetxattr|fgetxattr|listxattr|llistxattr|flistxattr|removexattr|lremovexattr|fremovexattr|tkill|sendfile64|futex|sched_setaffinity|sched_getaffinity|set_thread_area +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 250, 35, 34), //io_setup|io_destroy|io_getevents|io_submit|io_cancel +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 272, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 254, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 253, 32, 31), //exit_group +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 271, 31, 30), //epoll_create|epoll_ctl|epoll_wait|remap_file_pages|set_tid_address|timer_create|timer_settime|timer_gettime|timer_getoverrun|timer_delete|clock_settime|clock_gettime|clock_getres|clock_nanosleep|statfs64|fstatfs64|tgkill +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 273, 30, 29), //fadvise64_64 +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 322, 15, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 295, 7, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 288, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 286, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 285, 25, 24), //waitid +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 287, 24, 23), //add_key +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 291, 1, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 289, 22, 21), //keyctl -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 295, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 294, 20, 19), //inotify_init|inotify_add_watch|inotify_rm_watch -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 299, 19, 18), //openat|mkdirat|mknodat|fchownat -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 318, 3, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 313, 1, 0), -BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 311, 16, 15), //fstatat64|unlinkat|renameat|linkat|symlinkat|readlinkat|fchmodat|faccessat|pselect6|ppoll|unshare +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 294, 21, 20), //inotify_init|inotify_add_watch|inotify_rm_watch +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 313, 3, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 300, 1, 0), +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 299, 18, 17), //openat|mkdirat|mknodat|fchownat +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 311, 17, 16), //fstatat64|unlinkat|renameat|linkat|symlinkat|readlinkat|fchmodat|faccessat|pselect6|ppoll|unshare +BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 318, 1, 0), BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 317, 15, 14), //splice|sync_file_range|tee|vmsplice BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 321, 14, 13), //getcpu|epoll_pwait|utimensat BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 350, 7, 0), diff --git a/libm/libm.arm.map b/libm/libm.arm.map index 7e3175ddb..bee08d412 100644 --- a/libm/libm.arm.map +++ b/libm/libm.arm.map @@ -272,7 +272,7 @@ LIBC { *; }; -LIBC_O { +LIBC_O { # introduced=O global: cacoshl; cacosl; diff --git a/libm/libm.arm64.map b/libm/libm.arm64.map index 3e259dd3f..550c39bba 100644 --- a/libm/libm.arm64.map +++ b/libm/libm.arm64.map @@ -272,7 +272,7 @@ LIBC { *; }; -LIBC_O { +LIBC_O { # introduced=O global: cacoshl; cacosl; diff --git a/libm/libm.mips.map b/libm/libm.mips.map index b368d416c..0b6dc0231 100644 --- a/libm/libm.mips.map +++ b/libm/libm.mips.map @@ -272,7 +272,7 @@ LIBC { *; }; -LIBC_O { +LIBC_O { # introduced=O global: cacoshl; cacosl; diff --git a/libm/libm.mips64.map b/libm/libm.mips64.map index 3e259dd3f..550c39bba 100644 --- a/libm/libm.mips64.map +++ b/libm/libm.mips64.map @@ -272,7 +272,7 @@ LIBC { *; }; -LIBC_O { +LIBC_O { # introduced=O global: cacoshl; cacosl; diff --git a/libm/libm.x86.map b/libm/libm.x86.map index 3e259dd3f..550c39bba 100644 --- a/libm/libm.x86.map +++ b/libm/libm.x86.map @@ -272,7 +272,7 @@ LIBC { *; }; -LIBC_O { +LIBC_O { # introduced=O global: cacoshl; cacosl; diff --git a/libm/libm.x86_64.map b/libm/libm.x86_64.map index 3e259dd3f..550c39bba 100644 --- a/libm/libm.x86_64.map +++ b/libm/libm.x86_64.map @@ -272,7 +272,7 @@ LIBC { *; }; -LIBC_O { +LIBC_O { # introduced=O global: cacoshl; cacosl; diff --git a/tools/update_seccomp.sh b/tools/update_seccomp.sh new file mode 100755 index 000000000..d108e359a --- /dev/null +++ b/tools/update_seccomp.sh @@ -0,0 +1,7 @@ +#!/bin/sh +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $DIR/.. +./libc/tools/genseccomp.py + +git diff --exit-code HEAD libc/seccomp/ +exit $? diff --git a/tools/update_syscalls.sh b/tools/update_syscalls.sh new file mode 100755 index 000000000..3ad95ed59 --- /dev/null +++ b/tools/update_syscalls.sh @@ -0,0 +1,7 @@ +#!/bin/sh +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $DIR/.. +./libc/tools/gensyscalls.py + +git diff --exit-code HEAD libc/arch-*/syscalls/ +exit $? diff --git a/tools/update_version_scripts.sh b/tools/update_version_scripts.sh new file mode 100755 index 000000000..ccba475b3 --- /dev/null +++ b/tools/update_version_scripts.sh @@ -0,0 +1,7 @@ +#!/bin/sh +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $DIR/.. +./libc/tools/genversion-scripts.py + +git diff --exit-code HEAD libc/*.map libdl/*.map libm/*.map linker/*.map +exit $? |