selftests/seccomp: Change the syscall used in KILL_THREAD test

The Bionic version of pthread_create used on Android calls the prctl
function to give the stack and thread local storage a useful name. This
will cause the KILL_THREAD test to fail as it will kill the thread as
soon as it is created.

change the test to use getpid instead of prctl.

Signed-off-by: Terry Tritton <terry.tritton@linaro.org>
Link: https://lore.kernel.org/r/20240124141357.1243457-3-terry.tritton@linaro.org
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 5e705674b7067079d07384253212e14207264991..da11b95b88721b17e2584a7355483a75556d7451 100644 (file)
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -784,7 +784,7 @@ void *kill_thread(void *data)
        bool die = (bool)data;
 
        if (die) {
-               prctl(PR_GET_SECCOMP, 0, 0, 0, 0);
+               syscall(__NR_getpid);
                return (void *)SIBLING_EXIT_FAILURE;
        }
 
@@ -803,11 +803,11 @@ void kill_thread_or_group(struct __test_metadata *_metadata,
 {
        pthread_t thread;
        void *status;
-       /* Kill only when calling __NR_prctl. */
+       /* Kill only when calling __NR_getpid. */
        struct sock_filter filter_thread[] = {
                BPF_STMT(BPF_LD|BPF_W|BPF_ABS,
                        offsetof(struct seccomp_data, nr)),
-               BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_prctl, 0, 1),
+               BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_getpid, 0, 1),
                BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL_THREAD),
                BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW),
        };
@@ -819,7 +819,7 @@ void kill_thread_or_group(struct __test_metadata *_metadata,
        struct sock_filter filter_process[] = {
                BPF_STMT(BPF_LD|BPF_W|BPF_ABS,
                        offsetof(struct seccomp_data, nr)),
-               BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_prctl, 0, 1),
+               BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_getpid, 0, 1),
                BPF_STMT(BPF_RET|BPF_K, kill),
                BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW),
        };