summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2025-01-08 23:44:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-02-01 18:39:35 +0100
commit81aa72e17cca4d9e91c9d0fc09addc3df3d0ca17 (patch)
tree7cf3f392d776197ad1842299b079c7c267fd3385 /include
parent678c6e80babbf3c41120f707ca572f0ec6f281f2 (diff)
downloadlinux-81aa72e17cca4d9e91c9d0fc09addc3df3d0ca17.tar.gz
linux-81aa72e17cca4d9e91c9d0fc09addc3df3d0ca17.tar.bz2
linux-81aa72e17cca4d9e91c9d0fc09addc3df3d0ca17.zip
seccomp: Stub for !CONFIG_SECCOMP
[ Upstream commit f90877dd7fb5085dd9abd6399daf63dd2969fc90 ] When using !CONFIG_SECCOMP with CONFIG_GENERIC_ENTRY, the randconfig bots found the following snag: kernel/entry/common.c: In function 'syscall_trace_enter': >> kernel/entry/common.c:52:23: error: implicit declaration of function '__secure_computing' [-Wimplicit-function-declaration] 52 | ret = __secure_computing(NULL); | ^~~~~~~~~~~~~~~~~~ Since generic entry calls __secure_computing() unconditionally, fix this by moving the stub out of the ifdef clause for CONFIG_HAVE_ARCH_SECCOMP_FILTER so it's always available. Link: https://lore.kernel.org/oe-kbuild-all/202501061240.Fzk9qiFZ-lkp@intel.com/ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20250108-seccomp-stub-2-v2-1-74523d49420f@linaro.org Signed-off-by: Kees Cook <kees@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/seccomp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 709ad84809e1..8934c7da47f4 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -50,10 +50,10 @@ struct seccomp_data;
#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
static inline int secure_computing(void) { return 0; }
-static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
#else
static inline void secure_computing_strict(int this_syscall) { return; }
#endif
+static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
static inline long prctl_get_seccomp(void)
{