Messages in this thread Patch in this message | | | Date | Sun, 26 Jul 2020 16:29:52 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: core/entry] entry: Correct __secure_computing() stub |
| |
The following commit has been merged into the core/entry branch of tip:
Commit-ID: 3135f5b73592988af0eb1b11ccbb72a8667be201 Gitweb: https://git.kernel.org/tip/3135f5b73592988af0eb1b11ccbb72a8667be201 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Sun, 26 Jul 2020 18:14:43 +02:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Sun, 26 Jul 2020 18:22:27 +02:00
entry: Correct __secure_computing() stub
The original version of that used secure_computing() which has no arguments. Review requested to switch to __secure_computing() which has one. The function name was correct, but no argument added and of course compiling without SECCOMP was deemed overrated.
Add the missing function argument.
Fixes: 6823ecabf030 ("seccomp: Provide stub for __secure_computing()") Reported-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/seccomp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 03d28c3..51f234b 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -58,10 +58,11 @@ static inline int seccomp_mode(struct seccomp *s) struct seccomp { }; struct seccomp_filter { }; +struct seccomp_data; #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER static inline int secure_computing(void) { return 0; } -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
| |