Hello, Link to v1: https://lore.kernel.org/all/20250120134409.GA21241@xxxxxxxxxx/ Only 2/4 was changed, please see interdiff at the end. I've included the acks I got on 1/4, 3/4, and 4/4 (thanks!). Oleg. --- arch/mips/kernel/ptrace.c | 20 ++----------------- arch/powerpc/kernel/ptrace/ptrace.c | 2 +- include/linux/seccomp.h | 12 ++++-------- kernel/entry/common.c | 2 +- kernel/seccomp.c | 39 ++++++++++++++++++------------------- 5 files changed, 27 insertions(+), 48 deletions(-) ------------------------------------------------------------------------------- diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 6125baa96b76..9b959972bf4a 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -22,8 +22,9 @@ #include <linux/atomic.h> #include <asm/seccomp.h> -#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER extern int __secure_computing(void); + +#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER static inline int secure_computing(void) { if (unlikely(test_syscall_work(SECCOMP))) @@ -32,7 +33,6 @@ static inline int secure_computing(void) } #else extern void secure_computing_strict(int this_syscall); -static inline int __secure_computing(void) { return 0; } #endif extern long prctl_get_seccomp(void); diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 75e293d3c1a1..4bd2eb50f77b 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -29,13 +29,11 @@ #include <linux/syscalls.h> #include <linux/sysctl.h> +#include <asm/syscall.h> + /* Not exposed in headers: strictly internal use only. */ #define SECCOMP_MODE_DEAD (SECCOMP_MODE_FILTER + 1) -#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER -#include <asm/syscall.h> -#endif - #ifdef CONFIG_SECCOMP_FILTER #include <linux/file.h> #include <linux/filter.h> @@ -1062,6 +1060,13 @@ void secure_computing_strict(int this_syscall) else BUG(); } +int __secure_computing(void) +{ + int this_syscall = syscall_get_nr(current, current_pt_regs()); + + secure_computing_strict(this_syscall); + return 0; +} #else #ifdef CONFIG_SECCOMP_FILTER
