diff --git a/NEWS b/NEWS index 0896b4e2..d5ac6247 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,7 @@ Noteworthy changes in release ?.?? (????-??-??) * Improvements * Updated lists of BPF_*, BTRFS_*, KERN_*, KVM_CAP_*, NDA_*, NT_*, PR_*, - V4L2_*, and *_MAGIC constants. + SECCOMP_*, V4L2_*, and *_MAGIC constants. * Bug fixes * Fixed strace-k test on alpha. diff --git a/tests/seccomp-filter-v.c b/tests/seccomp-filter-v.c index b4bc9f82..076bde03 100644 --- a/tests/seccomp-filter-v.c +++ b/tests/seccomp-filter-v.c @@ -117,7 +117,8 @@ main(void) prog->len = BPF_MAXINSNS + 1; tprintf("seccomp(SECCOMP_SET_MODE_FILTER, %s, {len=%u, filter=[", "SECCOMP_FILTER_FLAG_TSYNC|SECCOMP_FILTER_FLAG_LOG|" - "SECCOMP_FILTER_FLAG_SPEC_ALLOW|0xfffffff8", + "SECCOMP_FILTER_FLAG_SPEC_ALLOW|" + "SECCOMP_FILTER_FLAG_NEW_LISTENER|0xfffffff0", prog->len); for (i = 0; i < BPF_MAXINSNS; ++i) { if (i) diff --git a/tests/seccomp-filter.c b/tests/seccomp-filter.c index 77caba71..18a2a99a 100644 --- a/tests/seccomp-filter.c +++ b/tests/seccomp-filter.c @@ -37,12 +37,13 @@ main(void) printf("seccomp(SECCOMP_SET_MODE_FILTER, %s, {len=%u, filter=%p})" " = %ld %s (%m)\n", "SECCOMP_FILTER_FLAG_TSYNC|SECCOMP_FILTER_FLAG_LOG|" - "SECCOMP_FILTER_FLAG_SPEC_ALLOW|0xfffffff8", + "SECCOMP_FILTER_FLAG_SPEC_ALLOW|" + "SECCOMP_FILTER_FLAG_NEW_LISTENER|0xfffffff0", prog->len, prog->filter, rc, errno2name()); - rc = syscall(__NR_seccomp, SECCOMP_SET_MODE_FILTER, -8L, efault); + rc = syscall(__NR_seccomp, SECCOMP_SET_MODE_FILTER, -16L, efault); printf("seccomp(SECCOMP_SET_MODE_FILTER, %s, %p) = %ld %s (%m)\n", - "0xfffffff8 /* SECCOMP_FILTER_FLAG_??? */", + "0xfffffff0 /* SECCOMP_FILTER_FLAG_??? */", efault, rc, errno2name()); puts("+++ exited with 0 +++"); diff --git a/tests/seccomp_get_action_avail.c b/tests/seccomp_get_action_avail.c index 3c92cd84..1fad98db 100644 --- a/tests/seccomp_get_action_avail.c +++ b/tests/seccomp_get_action_avail.c @@ -58,6 +58,9 @@ main(void) # ifdef SECCOMP_RET_ERRNO { ARG_STR(SECCOMP_RET_ERRNO) }, # endif +# ifdef SECCOMP_RET_USER_NOTIF + { ARG_STR(SECCOMP_RET_USER_NOTIF) }, +# endif # ifdef SECCOMP_RET_TRACE { ARG_STR(SECCOMP_RET_TRACE) }, # endif diff --git a/xlat/seccomp_filter_flags.in b/xlat/seccomp_filter_flags.in index be2dab87..8fc71de4 100644 --- a/xlat/seccomp_filter_flags.in +++ b/xlat/seccomp_filter_flags.in @@ -1,3 +1,4 @@ SECCOMP_FILTER_FLAG_TSYNC 1 SECCOMP_FILTER_FLAG_LOG 2 SECCOMP_FILTER_FLAG_SPEC_ALLOW 4 +SECCOMP_FILTER_FLAG_NEW_LISTENER 8 diff --git a/xlat/seccomp_ops.in b/xlat/seccomp_ops.in index e2d3fef2..97de186f 100644 --- a/xlat/seccomp_ops.in +++ b/xlat/seccomp_ops.in @@ -1,3 +1,4 @@ SECCOMP_SET_MODE_STRICT 0 SECCOMP_SET_MODE_FILTER 1 SECCOMP_GET_ACTION_AVAIL 2 +SECCOMP_GET_NOTIF_SIZES 3 diff --git a/xlat/seccomp_ret_action.in b/xlat/seccomp_ret_action.in index 6253448a..4b1455f5 100644 --- a/xlat/seccomp_ret_action.in +++ b/xlat/seccomp_ret_action.in @@ -2,6 +2,7 @@ SECCOMP_RET_KILL_PROCESS 0x80000000U SECCOMP_RET_KILL_THREAD 0 SECCOMP_RET_TRAP 0x00030000U SECCOMP_RET_ERRNO 0x00050000U +SECCOMP_RET_USER_NOTIF 0x7fc00000U SECCOMP_RET_TRACE 0x7ff00000U SECCOMP_RET_LOG 0x7ffc0000U SECCOMP_RET_ALLOW 0x7fff0000U