summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-01-14 14:10:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2025-01-14 14:10:17 -0800
commit619f0b6fad524f08d493a98d55bac9ab8895e3a6 (patch)
tree32871e3123bc4b4d985b0949dcb469dafbf68688
parent7f5b6a8ec18e3add4c74682f60b90c31bdf849f2 (diff)
parentf90877dd7fb5085dd9abd6399daf63dd2969fc90 (diff)
Merge tag 'seccomp-v6.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp fix from Kees Cook: "Fix a randconfig failure: - Unconditionally define stub for !CONFIG_SECCOMP (Linus Walleij)" * tag 'seccomp-v6.13-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: seccomp: Stub for !CONFIG_SECCOMP
-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 341980599c71..e45531455d3b 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -55,10 +55,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)
{