From 866f698b66351e4c441769de42044776958a9fb5 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 24 Nov 2020 20:58:07 +0900
Subject: [PATCH 1/2] test: skip several tests in test-seccomp when running on
 valgrind

---
 src/test/test-seccomp.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 853b0ef3b93..856c4663762 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -10,6 +10,9 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
+#if HAVE_VALGRIND_VALGRIND_H
+#include <valgrind/valgrind.h>
+#endif
 
 #include "alloc-util.h"
 #include "fd-util.h"
@@ -115,6 +118,14 @@ static void test_filter_sets(void) {
         for (unsigned i = 0; i < _SYSCALL_FILTER_SET_MAX; i++) {
                 pid_t pid;
 
+#if HAVE_VALGRIND_VALGRIND_H
+                if (RUNNING_ON_VALGRIND && IN_SET(i, SYSCALL_FILTER_SET_DEFAULT, SYSCALL_FILTER_SET_BASIC_IO, SYSCALL_FILTER_SET_SIGNAL)) {
+                        /* valgrind at least requires rt_sigprocmask(), read(), write(). */
+                        log_info("Running on valgrind, skipping %s", syscall_filter_sets[i].name);
+                        continue;
+                }
+#endif
+
                 log_info("Testing %s", syscall_filter_sets[i].name);
 
                 pid = fork();
@@ -323,6 +334,13 @@ static void test_protect_sysctl(void) {
 
                 assert_se(seccomp_protect_sysctl() >= 0);
 
+#if HAVE_VALGRIND_VALGRIND_H
+                if (RUNNING_ON_VALGRIND) {
+                        log_info("Running on valgrind, skipping syscall/EPERM test");
+                        _exit(EXIT_SUCCESS);
+                }
+#endif
+
 #if defined __NR__sysctl && __NR__sysctl >= 0
                 assert_se(syscall(__NR__sysctl, 0, 0, 0) < 0);
                 assert_se(errno == EPERM);
@@ -525,6 +543,12 @@ static void test_memory_deny_write_execute_mmap(void) {
                 log_notice("Not root, skipping %s", __func__);
                 return;
         }
+#if HAVE_VALGRIND_VALGRIND_H
+        if (RUNNING_ON_VALGRIND) {
+                log_notice("Running on valgrind, skipping %s", __func__);
+                return;
+        }
+#endif
 
         pid = fork();
         assert_se(pid >= 0);
@@ -585,6 +609,12 @@ static void test_memory_deny_write_execute_shmat(void) {
                 log_notice("Not root, skipping %s", __func__);
                 return;
         }
+#if HAVE_VALGRIND_VALGRIND_H
+        if (RUNNING_ON_VALGRIND) {
+                log_notice("Running on valgrind, skipping %s", __func__);
+                return;
+        }
+#endif
 
         shmid = shmget(IPC_PRIVATE, page_size(), 0);
         assert_se(shmid >= 0);

From a0dfd10a3d8091007c94cef2d341a84d46095787 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 24 Nov 2020 21:07:42 +0900
Subject: [PATCH 2/2] test: skip several tests in test-seccomp when running on
 asan

---
 src/test/test-seccomp.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index 856c4663762..2b5e4cf23a5 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -125,6 +125,13 @@ static void test_filter_sets(void) {
                         continue;
                 }
 #endif
+#if HAS_FEATURE_ADDRESS_SANITIZER
+                if (IN_SET(i, SYSCALL_FILTER_SET_DEFAULT, SYSCALL_FILTER_SET_BASIC_IO, SYSCALL_FILTER_SET_SIGNAL)) {
+                        /* ASAN at least requires sigaltstack(), read(), write(). */
+                        log_info("Running on address sanitizer, skipping %s", syscall_filter_sets[i].name);
+                        continue;
+                }
+#endif
 
                 log_info("Testing %s", syscall_filter_sets[i].name);
 
@@ -549,6 +556,10 @@ static void test_memory_deny_write_execute_mmap(void) {
                 return;
         }
 #endif
+#if HAS_FEATURE_ADDRESS_SANITIZER
+        log_notice("Running on address sanitizer, skipping %s", __func__);
+        return;
+#endif
 
         pid = fork();
         assert_se(pid >= 0);
@@ -615,6 +626,10 @@ static void test_memory_deny_write_execute_shmat(void) {
                 return;
         }
 #endif
+#if HAS_FEATURE_ADDRESS_SANITIZER
+        log_notice("Running on address sanitizer, skipping %s", __func__);
+        return;
+#endif
 
         shmid = shmget(IPC_PRIVATE, page_size(), 0);
         assert_se(shmid >= 0);