diff options
| author | Kees Cook | 2015-06-16 00:29:16 +0200 |
|---|---|---|
| committer | Kees Cook | 2015-07-15 20:52:54 +0200 |
| commit | 221272f97ca528048a577a3ff23d7774286ca5fd (patch) | |
| tree | 78c221163aa09492b6cc2c90943734e5fcc1b9ba | |
| parent | seccomp: add ptrace options for suspend/resume (diff) | |
| download | kernel-qcow2-linux-221272f97ca528048a577a3ff23d7774286ca5fd.tar.gz kernel-qcow2-linux-221272f97ca528048a577a3ff23d7774286ca5fd.tar.xz kernel-qcow2-linux-221272f97ca528048a577a3ff23d7774286ca5fd.zip | |
seccomp: swap hard-coded zeros to defined name
For clarity, if CONFIG_SECCOMP isn't defined, seccomp_mode() is returning
"disabled". This makes that more clear, along with another 0-use, and
results in no operational change.
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | include/linux/seccomp.h | 2 | ||||
| -rw-r--r-- | kernel/seccomp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index a19ddacdac30..f4265039a94c 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h @@ -78,7 +78,7 @@ static inline long prctl_set_seccomp(unsigned long arg2, char __user *arg3) static inline int seccomp_mode(struct seccomp *s) { - return 0; + return SECCOMP_MODE_DISABLED; } #endif /* CONFIG_SECCOMP */ diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 645e42d6fa4d..383bd6caca81 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -594,7 +594,7 @@ void secure_computing_strict(int this_syscall) unlikely(current->ptrace & PT_SUSPEND_SECCOMP)) return; - if (mode == 0) + if (mode == SECCOMP_MODE_DISABLED) return; else if (mode == SECCOMP_MODE_STRICT) __secure_computing_strict(this_syscall); |