xlat: update SECCOMP_* constants

* xlat/seccomp_ops.in (SECCOMP_GET_NOTIF_SIZES): New constant introduced
by Linux kernel commit v5.0-rc1~66^2~1^2~1.
* xlat/seccomp_ret_action.in (SECCOMP_RET_USER_NOTIF): Likewise.
* xlat/seccomp_filter_flags.in (SECCOMP_FILTER_FLAG_NEW_LISTENER):
Likewise.
* NEWS: Mention this.
* tests/seccomp-filter.c (main): Update expected output.
* tests/seccomp-filter-v.c (main): Likewise.
* tests/seccomp_get_action_avail.c (main): Check SECCOMP_RET_USER_NOTIF.

diff --git a/NEWS b/NEWS
index 0896b4e2686ae0a4248ffb3ce1de7b9366ab3d10..d5ac62475acc577b867b77f459f73a7a2ed747c6 100644 (file)
--- 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 b4bc9f823f4c524dc4c3c7924fcbc10bd8db5218..076bde03f659025ffdf52587e3cdf59c3ebe1433 100644 (file)
--- 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 77caba71d3ad1b9e38f6c570b957c6ac701e0610..18a2a99a99312495aa1150412349b7da05286722 100644 (file)
--- 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 3c92cd843595d651838b3891bbd77b618b39b4f8..1fad98db282eb7f6ff6e2cf2a61e61b91788b800 100644 (file)
--- 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 be2dab877398d082efa07dfa724d11ecb9372e8e..8fc71de4db8e38fd6e108eac605ffd1b226393b2 100644 (file)
--- 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 e2d3fef2462bfda7dc342673fa38844dc8aff73a..97de186f4543c56d66addf06b49f6a8413abc924 100644 (file)
--- 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 6253448a23406c41edb212cb66925b338fea41a4..4b1455f527df3f7248b341fe7dcb8c331e2dd10a 100644 (file)
--- 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