From edf162e8c360dd578d20a86c4ad79b54747a2d64 Mon Sep 17 00:00:00 2001 From: Jiaheng Hu Date: Tue, 7 Jul 2020 22:56:33 +0000 Subject: sys/linux: add SECCOMP_IOCTL_NOTIF_ADDFD Added the ioctl decsription for adding a fd to a seccomp notifier, currently in linux next. (https://lore.kernel.org/lkml/20200617220327.3731559-7-keescook@chromium.org/) --- sys/linux/seccomp.txt | 12 ++++++++++++ sys/linux/seccomp_386.const | 3 +++ sys/linux/seccomp_amd64.const | 3 +++ sys/linux/seccomp_arm.const | 3 +++ sys/linux/seccomp_arm64.const | 3 +++ sys/linux/seccomp_mips64le.const | 3 +++ sys/linux/seccomp_ppc64le.const | 3 +++ sys/linux/seccomp_riscv64.const | 3 +++ sys/linux/seccomp_s390x.const | 3 +++ 9 files changed, 36 insertions(+) (limited to 'sys/linux') diff --git a/sys/linux/seccomp.txt b/sys/linux/seccomp.txt index 3d071eb46..c007c0748 100644 --- a/sys/linux/seccomp.txt +++ b/sys/linux/seccomp.txt @@ -3,6 +3,7 @@ include include +include resource fd_seccomp[fd] resource seccomp_id[int64] @@ -18,6 +19,7 @@ seccomp$SECCOMP_GET_NOTIF_SIZES(op const[SECCOMP_GET_NOTIF_SIZES], flags const[0 ioctl$SECCOMP_IOCTL_NOTIF_RECV(fd fd_seccomp, cmd const[SECCOMP_IOCTL_NOTIF_RECV], arg ptr[out, seccomp_notif]) (breaks_returns) ioctl$SECCOMP_IOCTL_NOTIF_SEND(fd fd_seccomp, cmd const[SECCOMP_IOCTL_NOTIF_SEND], arg ptr[in, seccomp_notif_resp]) (breaks_returns) ioctl$SECCOMP_IOCTL_NOTIF_ID_VALID(fd fd_seccomp, cmd const[SECCOMP_IOCTL_NOTIF_ID_VALID], arg ptr[in, seccomp_id]) (breaks_returns) +ioctl$SECCOMP_IOCTL_NOTIF_ADDFD(fd fd_seccomp, cmd const[SECCOMP_IOCTL_NOTIF_ADDFD], arg ptr[in, seccomp_notif_addfd]) (breaks_returns) seccomp_notif_sizes { seccomp_notif int16 @@ -46,8 +48,18 @@ seccomp_notif_resp { flags const[0, int32] } +seccomp_notif_addfd { + id seccomp_id + flags flags[seccomp_addfd_flags, int32] + srcfd fd + newfd int32 + newfd_flags flags[seccomp_addfd_newfd_flags, int32] +} + seccomp_flags = 0, SECCOMP_FILTER_FLAG_TSYNC, SECCOMP_FILTER_FLAG_LOG, SECCOMP_FILTER_FLAG_SPEC_ALLOW seccomp_flags_listener = SECCOMP_FILTER_FLAG_NEW_LISTENER, SECCOMP_FILTER_FLAG_LOG_LISTENER, SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER +seccomp_addfd_flags = SECCOMP_ADDFD_FLAG_SETFD +seccomp_addfd_newfd_flags = O_CLOEXEC define SECCOMP_FILTER_FLAG_LOG_LISTENER SECCOMP_FILTER_FLAG_LOG | SECCOMP_FILTER_FLAG_NEW_LISTENER define SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER SECCOMP_FILTER_FLAG_SPEC_ALLOW | SECCOMP_FILTER_FLAG_NEW_LISTENER diff --git a/sys/linux/seccomp_386.const b/sys/linux/seccomp_386.const index 5234f12ad..a100c6170 100644 --- a/sys/linux/seccomp_386.const +++ b/sys/linux/seccomp_386.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 1075323139 SECCOMP_IOCTL_NOTIF_ID_VALID = 1074274562 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_amd64.const b/sys/linux/seccomp_amd64.const index e13d9b909..e493f849f 100644 --- a/sys/linux/seccomp_amd64.const +++ b/sys/linux/seccomp_amd64.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 1075323139 SECCOMP_IOCTL_NOTIF_ID_VALID = 1074274562 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_arm.const b/sys/linux/seccomp_arm.const index 6a0349011..4bc84c4a2 100644 --- a/sys/linux/seccomp_arm.const +++ b/sys/linux/seccomp_arm.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 1075323139 SECCOMP_IOCTL_NOTIF_ID_VALID = 1074274562 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_arm64.const b/sys/linux/seccomp_arm64.const index ca30b6f4c..52e4a048f 100644 --- a/sys/linux/seccomp_arm64.const +++ b/sys/linux/seccomp_arm64.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 1075323139 SECCOMP_IOCTL_NOTIF_ID_VALID = 1074274562 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_mips64le.const b/sys/linux/seccomp_mips64le.const index 633ff0f88..fbd431256 100644 --- a/sys/linux/seccomp_mips64le.const +++ b/sys/linux/seccomp_mips64le.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 2149064963 SECCOMP_IOCTL_NOTIF_ID_VALID = 2148016386 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_ppc64le.const b/sys/linux/seccomp_ppc64le.const index 4a7a6ba44..fb2e0aa07 100644 --- a/sys/linux/seccomp_ppc64le.const +++ b/sys/linux/seccomp_ppc64le.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 2149064963 SECCOMP_IOCTL_NOTIF_ID_VALID = 2148016386 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_riscv64.const b/sys/linux/seccomp_riscv64.const index ca30b6f4c..52e4a048f 100644 --- a/sys/linux/seccomp_riscv64.const +++ b/sys/linux/seccomp_riscv64.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 1075323139 SECCOMP_IOCTL_NOTIF_ID_VALID = 1074274562 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 diff --git a/sys/linux/seccomp_s390x.const b/sys/linux/seccomp_s390x.const index 25137baf4..bf41175e5 100644 --- a/sys/linux/seccomp_s390x.const +++ b/sys/linux/seccomp_s390x.const @@ -1,4 +1,6 @@ # AUTOGENERATED FILE +O_CLOEXEC = 524288 +SECCOMP_ADDFD_FLAG_SETFD = 1 SECCOMP_FILTER_FLAG_LOG = 2 SECCOMP_FILTER_FLAG_LOG_LISTENER = 10 SECCOMP_FILTER_FLAG_NEW_LISTENER = 8 @@ -7,6 +9,7 @@ SECCOMP_FILTER_FLAG_SPEC_ALLOW_LISTENER = 12 SECCOMP_FILTER_FLAG_TSYNC = 1 SECCOMP_GET_ACTION_AVAIL = 2 SECCOMP_GET_NOTIF_SIZES = 3 +SECCOMP_IOCTL_NOTIF_ADDFD = 1075323139 SECCOMP_IOCTL_NOTIF_ID_VALID = 1074274562 SECCOMP_IOCTL_NOTIF_RECV = 3226476800 SECCOMP_IOCTL_NOTIF_SEND = 3222806785 -- cgit mrf-deployment