script_core 0.1.1 → 0.2.0

data/ext/enterprise_script_service/libseccomp/src/arch-x86_64-syscalls.c

@@ -26,7 +26,7 @@
 #include "arch.h"
 #include "arch-x86_64.h"
 
-/* NOTE: based on Linux 4.15-rc7 */
+/* NOTE: based on Linux v5.4-rc4 */
 const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "_llseek", __PNR__llseek },
 	{ "_newselect", __PNR__newselect },
@@ -58,11 +58,17 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "chown32", __PNR_chown32 },
 	{ "chroot", 161 },
 	{ "clock_adjtime", 305 },
+	{ "clock_adjtime64", __PNR_clock_adjtime64 },
 	{ "clock_getres", 229 },
+	{ "clock_getres_time64", __PNR_clock_getres_time64 },
 	{ "clock_gettime", 228 },
+	{ "clock_gettime64", __PNR_clock_gettime64 },
 	{ "clock_nanosleep", 230 },
+	{ "clock_nanosleep_time64", __PNR_clock_nanosleep_time64 },
 	{ "clock_settime", 227 },
+	{ "clock_settime64", __PNR_clock_settime64 },
 	{ "clone", 56 },
+	{ "clone3", 435 },
 	{ "close", 3 },
 	{ "connect", 42 },
 	{ "copy_file_range", 326 },
@@ -106,7 +112,11 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "flock", 73 },
 	{ "fork", 57 },
 	{ "fremovexattr", 199 },
+	{ "fsconfig", 431 },
 	{ "fsetxattr", 190 },
+	{ "fsmount", 432 },
+	{ "fsopen", 430 },
+	{ "fspick", 433 },
 	{ "fstat", 5 },
 	{ "fstat64", __PNR_fstat64 },
 	{ "fstatat64", __PNR_fstatat64 },
@@ -117,6 +127,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "ftruncate", 77 },
 	{ "ftruncate64", __PNR_ftruncate64 },
 	{ "futex", 202 },
+	{ "futex_time64", __PNR_futex_time64 },
 	{ "futimesat", 261 },
 	{ "get_kernel_syms", 177 },
 	{ "get_mempolicy", 239 },
@@ -169,8 +180,12 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "io_destroy", 207 },
 	{ "io_getevents", 208 },
 	{ "io_pgetevents", 333 },
+	{ "io_pgetevents_time64", __PNR_io_pgetevents_time64 },
 	{ "io_setup", 206 },
 	{ "io_submit", 209 },
+	{ "io_uring_setup", 425 },
+	{ "io_uring_enter", 426 },
+	{ "io_uring_register", 427 },
 	{ "ioctl", 16 },
 	{ "ioperm", 173 },
 	{ "iopl", 172 },
@@ -214,6 +229,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "mmap2", __PNR_mmap2 },
 	{ "modify_ldt", 154 },
 	{ "mount", 165 },
+	{ "move_mount", 429 },
 	{ "move_pages", 279 },
 	{ "mprotect", 10 },
 	{ "mpx", __PNR_mpx },
@@ -221,7 +237,9 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "mq_notify", 244 },
 	{ "mq_open", 240 },
 	{ "mq_timedreceive", 243 },
+	{ "mq_timedreceive_time64", __PNR_mq_timedreceive_time64 },
 	{ "mq_timedsend", 242 },
+	{ "mq_timedsend_time64", __PNR_mq_timedsend_time64 },
 	{ "mq_unlink", 241 },
 	{ "mremap", 25 },
 	{ "msgctl", 71 },
@@ -246,6 +264,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "oldwait4", __PNR_oldwait4 },
 	{ "open", 2 },
 	{ "open_by_handle_at", 304 },
+	{ "open_tree", 428 },
 	{ "openat", 257 },
 	{ "pause", 34 },
 	{ "pciconfig_iobase", __PNR_pciconfig_iobase },
@@ -253,6 +272,8 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "pciconfig_write", __PNR_pciconfig_write },
 	{ "perf_event_open", 298 },
 	{ "personality", 135 },
+	{ "pidfd_open", 434 },
+	{ "pidfd_send_signal", 424 },
 	{ "pipe", 22 },
 	{ "pipe2", 293 },
 	{ "pivot_root", 155 },
@@ -261,6 +282,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "pkey_mprotect", 329 },
 	{ "poll", 7 },
 	{ "ppoll", 271 },
+	{ "ppoll_time64", __PNR_ppoll_time64 },
 	{ "prctl", 157 },
 	{ "pread64", 17 },
 	{ "preadv", 295 },
@@ -271,6 +293,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "prof", __PNR_prof },
 	{ "profil", __PNR_profil },
 	{ "pselect6", 270 },
+	{ "pselect6_time64", __PNR_pselect6_time64 },
 	{ "ptrace", 101 },
 	{ "putpmsg", 182 },
 	{ "pwrite64", 18 },
@@ -288,6 +311,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "recv", __PNR_recv },
 	{ "recvfrom", 45 },
 	{ "recvmmsg", 299 },
+	{ "recvmmsg_time64", __PNR_recvmmsg_time64 },
 	{ "recvmsg", 47 },
 	{ "remap_file_pages", 216 },
 	{ "removexattr", 197 },
@@ -305,6 +329,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "rt_sigreturn", 15 },
 	{ "rt_sigsuspend", 130 },
 	{ "rt_sigtimedwait", 128 },
+	{ "rt_sigtimedwait_time64", __PNR_rt_sigtimedwait_time64 },
 	{ "rt_tgsigqueueinfo", 297 },
 	{ "rtas", __PNR_rtas },
 	{ "s390_guarded_storage", __PNR_s390_guarded_storage },
@@ -319,6 +344,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "sched_getparam", 143 },
 	{ "sched_getscheduler", 145 },
 	{ "sched_rr_get_interval", 148 },
+	{ "sched_rr_get_interval_time64", __PNR_sched_rr_get_interval_time64 },
 	{ "sched_setaffinity", 203 },
 	{ "sched_setattr", 314 },
 	{ "sched_setparam", 142 },
@@ -331,6 +357,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "semget", 64 },
 	{ "semop", 65 },
 	{ "semtimedop", 220 },
+	{ "semtimedop_time64", __PNR_semtimedop_time64 },
 	{ "send", __PNR_send },
 	{ "sendfile", 40 },
 	{ "sendfile64", __PNR_sendfile64 },
@@ -424,11 +451,15 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "timer_delete", 226 },
 	{ "timer_getoverrun", 225 },
 	{ "timer_gettime", 224 },
+	{ "timer_gettime64", __PNR_timer_gettime64 },
 	{ "timer_settime", 223 },
+	{ "timer_settime64", __PNR_timer_settime64 },
 	{ "timerfd", __PNR_timerfd },
 	{ "timerfd_create", 283 },
 	{ "timerfd_gettime", 287 },
+	{ "timerfd_gettime64", __PNR_timerfd_gettime64 },
 	{ "timerfd_settime", 286 },
+	{ "timerfd_settime64", __PNR_timerfd_settime64 },
 	{ "times", 100 },
 	{ "tkill", 200 },
 	{ "truncate", 76 },
@@ -450,6 +481,7 @@ const struct arch_syscall_def x86_64_syscall_table[] = { \
 	{ "ustat", 136 },
 	{ "utime", 132 },
 	{ "utimensat", 280 },
+	{ "utimensat_time64", __PNR_utimensat_time64 },
 	{ "utimes", 235 },
 	{ "vfork", 58 },
 	{ "vhangup", 153 },

data/ext/enterprise_script_service/libseccomp/src/db.c

@@ -1063,6 +1063,7 @@ int db_col_reset(struct db_filter_col *col, uint32_t def_action)
 	col->attr.nnp_enable = 1;
 	col->attr.tsync_enable = 0;
 	col->attr.api_tskip = 0;
+	col->attr.log_enable = 0;
 
 	/* set the state */
 	col->state = _DB_STA_VALID;

data/ext/enterprise_script_service/libseccomp/src/gen_bpf.c

@@ -556,7 +556,7 @@ static void _state_release(struct bpf_state *state)
 static int _hsh_add(struct bpf_state *state, struct bpf_blk **blk_p,
 		    unsigned int found)
 {
-	uint64_t h_val;
+	uint64_t h_val, h_val_tmp[3];
 	struct bpf_hash_bkt *h_new, *h_iter, *h_prev = NULL;
 	struct bpf_blk *blk = *blk_p;
 	struct bpf_blk *b_iter;
@@ -569,7 +569,10 @@ static int _hsh_add(struct bpf_state *state, struct bpf_blk **blk_p,
 		return -ENOMEM;
 
 	/* generate the hash */
-	h_val = hash(blk->blks, _BLK_MSZE(blk));
+	h_val_tmp[0] = hash(blk->blks, _BLK_MSZE(blk));
+	h_val_tmp[1] = hash(&blk->acc_start, sizeof(blk->acc_start));
+	h_val_tmp[2] = hash(&blk->acc_end, sizeof(blk->acc_end));
+	h_val = hash(h_val_tmp, sizeof(h_val_tmp));
 	blk->hash = h_val;
 	blk->flag_hash = true;
 	blk->node = NULL;
@@ -584,7 +587,11 @@ hsh_add_restart:
 			if ((h_iter->blk->hash == h_val) &&
 			    (_BLK_MSZE(h_iter->blk) == _BLK_MSZE(blk)) &&
 			    (memcmp(h_iter->blk->blks, blk->blks,
-				    _BLK_MSZE(blk)) == 0)) {
+				    _BLK_MSZE(blk)) == 0) &&
+			    _ACC_CMP_EQ(h_iter->blk->acc_start,
+					blk->acc_start) &&
+			    _ACC_CMP_EQ(h_iter->blk->acc_end,
+					blk->acc_end)) {
 				/* duplicate block */
 				free(h_new);
 

data/ext/enterprise_script_service/libseccomp/src/python/Makefile.am

@@ -40,12 +40,12 @@ build: ../libseccomp.la libseccomp.pxd seccomp.pyx setup.py
 	${PY_BUILD} && touch build
 
 install-exec-local: build
-	${PY_INSTALL} --install-lib=${DESTDIR}/${pkgpythondir} \
-		--record=${DESTDIR}/${pkgpythondir}/install_files.txt
+	${PY_INSTALL} --install-lib=${DESTDIR}/${pyexecdir} \
+		--record=${DESTDIR}/${pyexecdir}/install_files.txt
 
 uninstall-local:
-	cat ${DESTDIR}/${pkgpythondir}/install_files.txt | xargs ${RM} -f
-	${RM} -f ${DESTDIR}/${pkgpythondir}/install_files.txt
+	cat ${DESTDIR}/${pyexecdir}/install_files.txt | xargs ${RM} -f
+	${RM} -f ${DESTDIR}/${pyexecdir}/install_files.txt
 
 clean-local:
 	[ ${srcdir} == ${builddir} ] || ${RM} -f ${builddir}/seccomp.pyx

data/ext/enterprise_script_service/libseccomp/src/python/seccomp.pyx

@@ -19,6 +19,8 @@
 # along with this library; if not, see <http://www.gnu.org/licenses>.
 #
 
+# cython: language_level = 3str
+
 """ Python bindings for the libseccomp library
 
 The libseccomp library provides and easy to use, platform independent,

data/ext/enterprise_script_service/libseccomp/tests/.gitignore

@@ -55,3 +55,4 @@ util.pyc
 47-live-kill_process
 48-sim-32b_args
 49-sim-64b_comparisons
+50-sim-hash_collision

data/ext/enterprise_script_service/libseccomp/tests/50-sim-hash_collision.c

@@ -0,0 +1,98 @@
+/**
+ * Seccomp Library test program
+ *
+ * Copyright (c) 2019 Oracle and/or its affiliates.  All rights reserved.
+ * Author: Tom Hromatka <tom.hromatka@oracle.com>
+ */
+
+/*
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of version 2.1 of the GNU Lesser General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#include <errno.h>
+#include <unistd.h>
+
+#include <seccomp.h>
+
+#include "util.h"
+
+int main(int argc, char *argv[])
+{
+	int rc;
+	struct util_options opts;
+	scmp_filter_ctx ctx = NULL;
+
+	rc = util_getopt(argc, argv, &opts);
+	if (rc < 0)
+		goto out;
+
+	rc = seccomp_api_set(1);
+	if (rc != 0)
+		return -rc;
+
+	ctx = seccomp_init(SCMP_ACT_ERRNO(100));
+	if (ctx == NULL)
+		return ENOMEM;
+
+	rc = seccomp_arch_remove(ctx, SCMP_ARCH_NATIVE);
+	if (rc != 0)
+		goto out;
+	rc = seccomp_arch_add(ctx, SCMP_ARCH_X86_64);
+	if (rc != 0)
+		goto out;
+
+	/* libseccomp utilizes a hash table to manage BPF blocks.  It
+	 * currently employs MurmurHash3 where the key is the hashed values
+	 * of the BPF instruction blocks, the accumulator start, and the
+	 * accumulator end.  Changes to the hash algorithm will likely affect
+	 * this test.
+	 */
+
+	/* The following rules were derived from an issue reported by Tor:
+	 * https://github.com/seccomp/libseccomp/issues/148
+	 *
+	 * In the steps below, syscall 1001 is configured similarly to how
+	 * Tor configured socket.  The fairly complex rules below led to
+	 * a hash collision with rt_sigaction (syscall 1000) in this test.
+	 */
+
+	rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, 1001, 3,
+			      SCMP_A0(SCMP_CMP_EQ, 1),
+			      SCMP_A1(SCMP_CMP_MASKED_EQ, 0xf, 2),
+			      SCMP_A2(SCMP_CMP_EQ, 3));
+	if (rc != 0)
+		goto out;
+	rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, 1001, 2,
+			      SCMP_A0(SCMP_CMP_EQ, 1),
+			      SCMP_A1(SCMP_CMP_MASKED_EQ, 0xf, 1));
+	if (rc != 0)
+		goto out;
+
+
+	rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, 1000, 1,
+			      SCMP_A0(SCMP_CMP_EQ, 2));
+	if (rc != 0)
+		goto out;
+	rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, 1000, 1,
+			      SCMP_A0(SCMP_CMP_EQ, 1));
+	if (rc != 0)
+		goto out;
+
+	rc = util_filter_output(&opts, ctx);
+	if (rc)
+		goto out;
+
+out:
+	seccomp_release(ctx);
+	return (rc < 0 ? -rc : rc);
+}

data/ext/enterprise_script_service/libseccomp/tests/50-sim-hash_collision.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+#
+# Seccomp Library test program
+#
+# Copyright (c) 2019 Oracle and/or its affiliates.  All rights reserved.
+# Author: Tom Hromatka <tom.hromatka@oracle.com>
+#
+
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of version 2.1 of the GNU Lesser General Public License as
+# published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, see <http://www.gnu.org/licenses>.
+#
+
+import argparse
+import sys
+
+import util
+
+from seccomp import *
+
+def test(args):
+    set_api(1)
+    f = SyscallFilter(ERRNO(100))
+    f.remove_arch(Arch())
+    f.add_arch(Arch("x86_64"))
+
+    # libseccomp utilizes a hash table to manage BPF blocks.  It currently
+    # employs MurmurHash3 where the key is the hashed values of the BPF
+    # instruction blocks, the accumulator start, and the accumulator end.
+    # Changes to the hash algorithm will likely affect this test.
+
+    # The following rules were derived from an issue reported by Tor:
+    # https://github.com/seccomp/libseccomp/issues/148
+    #
+    # In the steps below, syscall 1001 is configured similarly to how
+    # Tor configured socket.  The fairly complex rules below led to
+    # a hash collision with rt_sigaction (syscall 1000) in this test.
+
+    f.add_rule_exactly(ALLOW, 1001, Arg(0, EQ, 1), Arg(1, MASKED_EQ, 0xf, 2),
+                       Arg(2, EQ, 3))
+    f.add_rule_exactly(ALLOW, 1001, Arg(0, EQ, 1), Arg(1, MASKED_EQ, 0xf, 1))
+    f.add_rule_exactly(ALLOW, 1000, Arg(0, EQ, 2))
+    f.add_rule_exactly(ALLOW, 1000, Arg(0, EQ, 1))
+    return f
+
+args = util.get_opt()
+ctx = test(args)
+util.filter_output(args, ctx)
+
+# kate: syntax python;
+# kate: indent-mode python; space-indent on; indent-width 4; mixedindent off;

data/ext/enterprise_script_service/libseccomp/tests/50-sim-hash_collision.tests

@@ -0,0 +1,18 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright (c) 2019 Oracle and/or its affiliates.  All rights reserved.
+# Author: Tom Hromatka <tom.hromatka@oracle.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall		Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
+50-sim-hash_collision	x86_64 1000		1	N	N	N	N	N	ALLOW
+50-sim-hash_collision	x86_64 1000		2	N	N	N	N	N	ALLOW
+50-sim-hash_collision	x86_64 1000		3	N	N	N	N	N	ERRNO(100)
+50-sim-hash_collision	x86_64 1001		1	2	3	N	N	N	ALLOW
+50-sim-hash_collision	x86_64 1001		1	1	N	N	N	N	ALLOW
+50-sim-hash_collision	x86_64 1001		2	N	N	N	N	N	ERRNO(100)
+50-sim-hash_collision	x86_64 1001		1	3	N	N	N	N	ERRNO(100)
+50-sim-hash_collision	x86_64 1001		1	2	4	N	N	N	ERRNO(100)

data/ext/enterprise_script_service/libseccomp/tests/Makefile.am

@@ -88,7 +88,8 @@ check_PROGRAMS = \
 	46-sim-kill_process \
 	47-live-kill_process \
 	48-sim-32b_args \
-	49-sim-64b_comparisons
+	49-sim-64b_comparisons \
+	50-sim-hash_collision
 
 EXTRA_DIST_TESTPYTHON = \
 	util.py \
@@ -139,7 +140,8 @@ EXTRA_DIST_TESTPYTHON = \
 	46-sim-kill_process.py \
 	47-live-kill_process.py \
 	48-sim-32b_args.py \
-	49-sim-64b_comparisons.py
+	49-sim-64b_comparisons.py \
+	50-sim-hash_collision.py
 
 EXTRA_DIST_TESTCFGS = \
 	01-sim-allow.tests \
@@ -190,7 +192,8 @@ EXTRA_DIST_TESTCFGS = \
 	46-sim-kill_process.tests \
 	47-live-kill_process.tests \
 	48-sim-32b_args.tests \
-	49-sim-64b_comparisons.tests
+	49-sim-64b_comparisons.tests \
+	50-sim-hash_collision.tests
 
 EXTRA_DIST_TESTSCRIPTS = \
 	38-basic-pfc_coverage.sh 38-basic-pfc_coverage.pfc

data/ext/enterprise_script_service/libseccomp/tools/Makefile.am

@@ -16,8 +16,6 @@
 # along with this library; if not, see <http://www.gnu.org/licenses>.
 #
 
-AM_CPPFLAGS = -I${top_builddir}/include
-
 noinst_LTLIBRARIES = util.la
 util_la_SOURCES = util.c util.h bpf.h
 util_la_LDFLAGS = -module