Add an operation, SECCOMP_CLONE_FILTER, that can copy the seccomp filters from another process to the current process.
I roughly reproduced the Docker seccomp filter [1] and timed how long it takes to build it (via libseccomp) and attach it to a process. After 1000 runs, on average it took 3,720,000 TSC ticks (or ~1430 microseconds) on an AMD EPYC 9J14 running at 2596 MHz. The median build/load time was 3,704,000 TSC ticks.
On the same system, I preloaded the above Docker seccomp filter onto a process. (Note that I opened a pidfd to the reference process and left the pidfd open for the entire run.) I then cloned the filter using the feature in this patch to 1000 new processes. On average, it took 1,900 TSC ticks (or ~0.7 microseconds) to copy the filter to the new processes. The median clone time was 1,716 TSC ticks.
This is approximately a 1900x performance improvement for those container managers that are using the exact same seccomp filter across all of their containers.
[1] https://raw.githubusercontent.com/moby/moby/refs/heads/master/profiles/secco...
Signed-off-by: Tom Hromatka tom.hromatka@oracle.com --- .../userspace-api/seccomp_filter.rst | 10 ++ include/uapi/linux/seccomp.h | 1 + kernel/seccomp.c | 48 ++++++ samples/seccomp/.gitignore | 1 + samples/seccomp/Makefile | 2 +- samples/seccomp/clone-filter.c | 150 ++++++++++++++++++ tools/include/uapi/linux/seccomp.h | 1 + tools/testing/selftests/seccomp/seccomp_bpf.c | 114 +++++++++++++ 8 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 samples/seccomp/clone-filter.c
diff --git a/Documentation/userspace-api/seccomp_filter.rst b/Documentation/userspace-api/seccomp_filter.rst index cff0fa7f3175..ef1797d093f6 100644 --- a/Documentation/userspace-api/seccomp_filter.rst +++ b/Documentation/userspace-api/seccomp_filter.rst @@ -289,6 +289,16 @@ above in this document: all arguments being read from the tracee's memory should be read into the tracer's memory before any policy decisions are made. This allows for an atomic decision on syscall arguments.
+Cloning an Existing Seccomp Filter +================================== + +Constructing and loading a complex seccomp filter can often take a non-trivial +amount of time. If a user wants to use the same seccomp filter across more +than one process, it can be cloned to new processes via the +``SECCOMP_CLONE_FILTER`` operation. Note that the clone will only succeed if +the destination process does not have any seccomp filters already applied to +it. See ``samples/seccomp/clone-filter.c`` for an example. + Sysctls =======
diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index dbfc9b37fcae..b0917e333b4b 100644 --- a/include/uapi/linux/seccomp.h +++ b/include/uapi/linux/seccomp.h @@ -16,6 +16,7 @@ #define SECCOMP_SET_MODE_FILTER 1 #define SECCOMP_GET_ACTION_AVAIL 2 #define SECCOMP_GET_NOTIF_SIZES 3 +#define SECCOMP_CLONE_FILTER 4
/* Valid flags for SECCOMP_SET_MODE_FILTER */ #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 3bbfba30a777..efc7ae1d5505 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -2079,6 +2079,49 @@ static long seccomp_get_notif_sizes(void __user *usizes) return 0; }
+static long seccomp_clone_filter(void __user *pidfd) +{ + struct seccomp new_seccomp; + struct task_struct *task; + unsigned int flags; + + if (!task_no_new_privs(current) && + !ns_capable_noaudit(current_user_ns(), CAP_SYS_ADMIN)) + return -EACCES; + + task = pidfd_get_task((intptr_t)pidfd, &flags); + if (IS_ERR(task)) + return -ESRCH; + + spin_lock_irq(&task->sighand->siglock); + if (atomic_read(&task->seccomp.filter_count) == 0) { + spin_unlock_irq(&task->sighand->siglock); + put_task_struct(task); + return -EINVAL; + } + + get_seccomp_filter(task); + new_seccomp = task->seccomp; + spin_unlock_irq(&task->sighand->siglock); + + spin_lock_irq(¤t->sighand->siglock); + /* Fail the clone operation if this process already has filters */ + if (atomic_read(¤t->seccomp.filter_count) > 0) { + spin_unlock_irq(¤t->sighand->siglock); + __seccomp_filter_release(new_seccomp.filter); + put_task_struct(task); + return -EINVAL; + } + + /* no barriers - only current->seccomp.filter is read locklessly */ + current->seccomp = new_seccomp; + set_task_syscall_work(current, SECCOMP); + spin_unlock_irq(¤t->sighand->siglock); + put_task_struct(task); + + return 0; +} + /* Common entry point for both prctl and syscall. */ static long do_seccomp(unsigned int op, unsigned int flags, void __user *uargs) @@ -2100,6 +2143,11 @@ static long do_seccomp(unsigned int op, unsigned int flags, return -EINVAL;
return seccomp_get_notif_sizes(uargs); + case SECCOMP_CLONE_FILTER: + if (flags != 0) + return -EINVAL; + + return seccomp_clone_filter(uargs); default: return -EINVAL; } diff --git a/samples/seccomp/.gitignore b/samples/seccomp/.gitignore index a6df0da77c5d..b404cba5bb69 100644 --- a/samples/seccomp/.gitignore +++ b/samples/seccomp/.gitignore @@ -3,3 +3,4 @@ /bpf-fancy /dropper /user-trap +/clone-filter diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index c85ae0ed8342..d38977f41b86 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -userprogs-always-y += bpf-fancy dropper bpf-direct user-trap +userprogs-always-y += bpf-fancy dropper bpf-direct user-trap clone-filter
bpf-fancy-objs := bpf-fancy.o bpf-helper.o
diff --git a/samples/seccomp/clone-filter.c b/samples/seccomp/clone-filter.c new file mode 100644 index 000000000000..c7d520bf61cf --- /dev/null +++ b/samples/seccomp/clone-filter.c @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Seccomp filter example for cloning a filter + * + * Copyright (c) 2025 Oracle and/or its affiliates. + * Author: Tom Hromatka tom.hromatka@oracle.com + * + * The code may be used by anyone for any purpose, + * and can serve as a starting point for developing + * applications that reuse the same seccomp filter + * across many processes. + */ +#include <linux/seccomp.h> +#include <linux/filter.h> +#include <sys/syscall.h> +#include <sys/prctl.h> +#include <sys/wait.h> +#include <stdbool.h> +#include <signal.h> +#include <stddef.h> +#include <stdlib.h> +#include <unistd.h> +#include <stdio.h> +#include <errno.h> + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) + +static int seccomp(unsigned int op, unsigned int flags, void *args) +{ + errno = 0; + return syscall(__NR_seccomp, op, flags, args); +} + +static int install_filter(void) +{ + struct sock_filter deny_filter[] = { + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, + offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_getppid, 0, 1), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO | ESRCH), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog deny_prog = { + .len = (unsigned short)ARRAY_SIZE(deny_filter), + .filter = deny_filter, + }; + + return seccomp(SECCOMP_SET_MODE_FILTER, 0, &deny_prog); +} + +static int clone_filter(pid_t ref_pid) +{ + int ref_pidfd, ret; + + ref_pidfd = syscall(SYS_pidfd_open, ref_pid, 0); + if (ref_pidfd < 0) + return -errno; + + ret = seccomp(SECCOMP_CLONE_FILTER, 0, (void *)(intptr_t)ref_pidfd); + + close(ref_pidfd); + + return ret; +} + +static void do_ref_filter(void) +{ + int ret; + + ret = install_filter(); + if (ret) { + perror("Failed to install ref filter\n"); + exit(1); + } + + while (true) + sleep(1); +} + +static void do_child_process(pid_t ref_pid) +{ + pid_t res; + int ret; + + ret = clone_filter(ref_pid); + if (ret != 0) { + perror("Failed to clone filter. Installing filter from scratch\n"); + + ret = install_filter(); + if (ret != 0) { + perror("Filter install failed\n"); + exit(ret); + } + } + + res = syscall(__NR_getpid); + if (res < 0) { + perror("getpid() unexpectedly failed\n"); + exit(errno); + } + + res = syscall(__NR_getppid); + if (res > 0) { + perror("getppid() unexpectedly succeeded\n"); + exit(1); + } + + exit(0); +} + +int main(void) +{ + pid_t ref_pid = -1, child_pid = -1; + int ret = -EINVAL, status; + + ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); + if (ret) { + perror("set no new privs unexpectedly failed\n"); + exit(errno); + } + + ref_pid = fork(); + if (ref_pid < 0) + exit(errno); + else if (ref_pid == 0) + do_ref_filter(); + + child_pid = fork(); + if (child_pid < 0) + goto out; + else if (child_pid == 0) + do_child_process(ref_pid); + + waitpid(child_pid, &status, 0); + if (WEXITSTATUS(status) != 0) { + perror("child process failed"); + ret = WEXITSTATUS(status); + goto out; + } + + ret = 0; + +out: + if (ref_pid != -1) + kill(ref_pid, SIGKILL); + if (child_pid != -1) + kill(child_pid, SIGKILL); + + exit(ret); +} diff --git a/tools/include/uapi/linux/seccomp.h b/tools/include/uapi/linux/seccomp.h index dbfc9b37fcae..b0917e333b4b 100644 --- a/tools/include/uapi/linux/seccomp.h +++ b/tools/include/uapi/linux/seccomp.h @@ -16,6 +16,7 @@ #define SECCOMP_SET_MODE_FILTER 1 #define SECCOMP_GET_ACTION_AVAIL 2 #define SECCOMP_GET_NOTIF_SIZES 3 +#define SECCOMP_CLONE_FILTER 4
/* Valid flags for SECCOMP_SET_MODE_FILTER */ #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index fc4910d35342..53ea2610dcf8 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -178,6 +178,10 @@ struct seccomp_data { #define SECCOMP_GET_NOTIF_SIZES 3 #endif
+#ifndef SECCOMP_CLONE_FILTER +#define SECCOMP_CLONE_FILTER 4 +#endif + #ifndef SECCOMP_FILTER_FLAG_TSYNC #define SECCOMP_FILTER_FLAG_TSYNC (1UL << 0) #endif @@ -5221,6 +5225,116 @@ TEST_F(URETPROBE, uretprobe_default_block_with_uretprobe_syscall) ASSERT_EQ(0, run_probed_with_filter(&prog)); }
+TEST(clone_filter) +{ + struct sock_filter deny_filter[] = { + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, + offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_getppid, 0, 1), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO | ESRCH), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog deny_prog = { + .len = (unsigned short)ARRAY_SIZE(deny_filter), + .filter = deny_filter, + }; + + pid_t child_pid, self_pid, res; + int child_pidfd, ret, status; + int pipe_c2p[2], pipe_p2c[2]; + ssize_t bytes_read; + char buf = ' '; + + /* Setup two pipes for communicating between parent and child */ + ASSERT_EQ(0, pipe(pipe_c2p)); + ASSERT_EQ(0, pipe(pipe_p2c)); + + ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0); + ASSERT_EQ(0, ret) { + TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!"); + } + + self_pid = getpid(); + + child_pid = fork(); + ASSERT_GE(child_pid, 0); + + if (child_pid == 0) { + EXPECT_EQ(0, close(pipe_c2p[0])); + EXPECT_EQ(0, close(pipe_p2c[1])); + + ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)); + ASSERT_EQ(0, prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &deny_prog)); + + res = syscall(__NR_getppid); + EXPECT_EQ(res, -1); + EXPECT_EQ(errno, ESRCH); + + /* Tell the parent that our filter is ready to be cloned */ + EXPECT_EQ(1, write(pipe_c2p[1], ".", 1)); + + /* Wait for the parent to tell us we can exit */ + bytes_read = read(pipe_p2c[0], &buf, 1); + EXPECT_EQ(bytes_read, 1); + EXPECT_EQ(0, close(pipe_c2p[1])); + EXPECT_EQ(0, close(pipe_p2c[0])); + _exit(0); + } + + ASSERT_EQ(0, close(pipe_p2c[0])); + ASSERT_EQ(0, close(pipe_c2p[1])); + + /* Wait for the child pid to load its filter */ + bytes_read = read(pipe_c2p[0], &buf, 1); + ASSERT_EQ(bytes_read, 1); + + child_pidfd = syscall(SYS_pidfd_open, child_pid, 0); + EXPECT_GE(child_pidfd, 0); + + /* Invalid flags provided */ + ret = seccomp(SECCOMP_CLONE_FILTER, -1, (void *)(intptr_t)child_pidfd); + EXPECT_EQ(-1, ret); + EXPECT_EQ(errno, EINVAL); + + /* Invalid pidfd provided */ + errno = 0; + ret = seccomp(SECCOMP_CLONE_FILTER, 0, (void *)(intptr_t)123456); + EXPECT_EQ(-1, ret); + EXPECT_EQ(errno, ESRCH); + + errno = 0; + res = syscall(__NR_getppid); + EXPECT_GE(res, 0); + EXPECT_EQ(errno, 0); + + ret = seccomp(SECCOMP_CLONE_FILTER, 0, (void *)(intptr_t)child_pidfd); + EXPECT_EQ(0, ret); + EXPECT_EQ(errno, 0); + + /* Cloning another set of filters is not currently allowed */ + ret = seccomp(SECCOMP_CLONE_FILTER, 0, (void *)(intptr_t)child_pidfd); + EXPECT_EQ(-1, ret); + EXPECT_EQ(errno, EINVAL); + + res = syscall(__NR_getppid); + EXPECT_EQ(res, -1); + EXPECT_EQ(errno, ESRCH); + + res = syscall(__NR_getpid); + EXPECT_EQ(res, self_pid); + + close(child_pidfd); + + /* Tell the child it can exit */ + ASSERT_EQ(1, write(pipe_p2c[1], ".", 1)); + + ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0)); + ASSERT_EQ(true, WIFEXITED(status)); + + ASSERT_EQ(0, close(pipe_p2c[1])); + ASSERT_EQ(0, close(pipe_c2p[0])); +} + /* * TODO: * - expand NNP testing