diff options
| author | Will Drewry <wad@chromium.org> | 2012-04-17 15:48:57 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-04-17 22:24:50 -0400 |
| commit | e4da89d02f369450996cfd04f64b1cce4d8afaea (patch) | |
| tree | 93d5e48347bb6c47ef10741d225969cacd57f77e /arch/mips/kernel | |
| parent | b1fa650c7e6e81ca788fef52b1659295eb82ffdd (diff) | |
seccomp: ignore secure_computing return values
This change is inspired by
https://lkml.org/lkml/2012/4/16/14
which fixes the build warnings for arches that don't support
CONFIG_HAVE_ARCH_SECCOMP_FILTER.
In particular, there is no requirement for the return value of
secure_computing() to be checked unless the architecture supports
seccomp filter. Instead of silencing the warnings with (void)
a new static inline is added to encode the expected behavior
in a compiler and human friendly way.
v2: - cleans things up with a static inline
- removes sfr's signed-off-by since it is a different approach
v1: - matches sfr's original change
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Will Drewry <wad@chromium.org>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 7c24c2973c6..4812c6d916e 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c | |||
| @@ -535,7 +535,7 @@ static inline int audit_arch(void) | |||
| 535 | asmlinkage void syscall_trace_enter(struct pt_regs *regs) | 535 | asmlinkage void syscall_trace_enter(struct pt_regs *regs) |
| 536 | { | 536 | { |
| 537 | /* do the secure computing check first */ | 537 | /* do the secure computing check first */ |
| 538 | secure_computing(regs->regs[2]); | 538 | secure_computing_strict(regs->regs[2]); |
| 539 | 539 | ||
| 540 | if (!(current->ptrace & PT_PTRACED)) | 540 | if (!(current->ptrace & PT_PTRACED)) |
| 541 | goto out; | 541 | goto out; |
