diff options
Diffstat (limited to 'arch/arm/kernel/ptrace.c')
| -rw-r--r-- | arch/arm/kernel/ptrace.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 0c27ed6f3f23..5e772a21ab97 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c | |||
| @@ -933,8 +933,13 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno) | |||
| 933 | current_thread_info()->syscall = scno; | 933 | current_thread_info()->syscall = scno; |
| 934 | 934 | ||
| 935 | /* Do the secure computing check first; failures should be fast. */ | 935 | /* Do the secure computing check first; failures should be fast. */ |
| 936 | if (secure_computing(scno) == -1) | 936 | #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER |
| 937 | if (secure_computing() == -1) | ||
| 937 | return -1; | 938 | return -1; |
| 939 | #else | ||
| 940 | /* XXX: remove this once OABI gets fixed */ | ||
| 941 | secure_computing_strict(scno); | ||
| 942 | #endif | ||
| 938 | 943 | ||
| 939 | if (test_thread_flag(TIF_SYSCALL_TRACE)) | 944 | if (test_thread_flag(TIF_SYSCALL_TRACE)) |
| 940 | tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER); | 945 | tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER); |