Skip to content

Commit 619f0b6

Browse files
committed
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
2 parents 7f5b6a8 + f90877d commit 619f0b6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/seccomp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ struct seccomp_data;
5555

5656
#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
5757
static inline int secure_computing(void) { return 0; }
58-
static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
5958
#else
6059
static inline void secure_computing_strict(int this_syscall) { return; }
6160
#endif
61+
static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }
6262

6363
static inline long prctl_get_seccomp(void)
6464
{

0 commit comments

Comments
 (0)