Commit 139abf8b authored Jan 08, 2025 by Linus Walleij Committed by Wen Zhiwei Mar 21, 2025

seccomp: Stub for !CONFIG_SECCOMP

stable inclusion
from stable-v6.6.75
commit 06bfc95f817bafac7f93bb075e334905d24b0ab4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSPQB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=06bfc95f817bafac7f93bb075e334905d24b0ab4

--------------------------------

[ 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>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent 2a514ac3

include/linux/seccomp.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,10 +70,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)
		{