From: Dmitry V. Levin Date: Wed, 1 Nov 2017 02:02:21 +0000 (+0000) Subject: Rename SECCOMP_RET_KILL to SECCOMP_RET_KILL_THREAD X-Git-Tag: v4.20~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01d45b6c2b33683e8294e38cec773812a6623450;p=strace Rename SECCOMP_RET_KILL to SECCOMP_RET_KILL_THREAD Follow linux kernel commit v4.14-rc2~15^2~4 and rename SECCOMP_RET_KILL to SECCOMP_RET_KILL_THREAD. * xlat/seccomp_ret_action.in (SECCOMP_RET_KILL): Rename to SECCOMP_RET_KILL_THREAD. * tests/prctl-seccomp-filter-v.c (main): Update expected output. * tests/seccomp-filter-v.c (main): Likewise. --- diff --git a/tests/prctl-seccomp-filter-v.c b/tests/prctl-seccomp-filter-v.c index cfd5d3dd..7a65d898 100644 --- a/tests/prctl-seccomp-filter-v.c +++ b/tests/prctl-seccomp-filter-v.c @@ -114,7 +114,7 @@ main(void) PRINT_DENY_SYSCALL(sync, EBUSY), PRINT_DENY_SYSCALL(setsid, EPERM), - printf("BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL)"); + printf("BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL_THREAD)"); puts("]}) = 0"); puts("+++ exited with 0 +++"); diff --git a/tests/seccomp-filter-v.c b/tests/seccomp-filter-v.c index 6762754f..34ab3b58 100644 --- a/tests/seccomp-filter-v.c +++ b/tests/seccomp-filter-v.c @@ -95,7 +95,7 @@ main(void) tprintf("%s", ""); static const char kill_stmt_txt[] = - "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL)"; + "BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL_THREAD)"; struct sock_filter *const filter = tail_memdup(filter_c, sizeof(filter_c)); struct sock_filter *const big_filter = diff --git a/xlat/seccomp_ret_action.in b/xlat/seccomp_ret_action.in index c7704c42..d745eb65 100644 --- a/xlat/seccomp_ret_action.in +++ b/xlat/seccomp_ret_action.in @@ -1,4 +1,4 @@ -SECCOMP_RET_KILL 0 +SECCOMP_RET_KILL_THREAD 0 SECCOMP_RET_TRAP 0x00030000U SECCOMP_RET_ERRNO 0x00050000U SECCOMP_RET_TRACE 0x7ff00000U