The following commit has been merged into the core/entry branch of tip: Commit-ID: 6823ecabf03031d610a6c5afe7ed4b4fd659a99f Gitweb: https://git.kernel.org/tip/6823ecabf03031d610a6c5afe7ed4b4fd659a99f Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Wed, 22 Jul 2020 23:59:55 +02:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Fri, 24 Jul 2020 14:59:03 +02:00 seccomp: Provide stub for __secure_computing() To avoid #ifdeffery in the upcoming generic syscall entry work code provide a stub for __secure_computing() as this is preferred over secure_computing() because the TIF flag is already evaluated. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: Kees Cook <keescook@xxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200722220519.404974280@xxxxxxxxxxxxx --- include/linux/seccomp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 4192369..03d28c3 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -61,6 +61,7 @@ struct seccomp_filter { }; #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER static inline int secure_computing(void) { return 0; } +static inline int __secure_computing(void) { return 0; } #else static inline void secure_computing_strict(int this_syscall) { return; } #endif