diff options
| author | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
| commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
| tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /arch/parisc/kernel/ptrace.c | |
| parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.gz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip | |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc/kernel/ptrace.c')
| -rw-r--r-- | arch/parisc/kernel/ptrace.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index e842ee233db4..3bab72462ab5 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c @@ -270,6 +270,12 @@ long do_syscall_trace_enter(struct pt_regs *regs) { long ret = 0; + /* Do the secure computing check first. */ + if (secure_computing(regs->gr[20])) { + /* seccomp failures shouldn't expose any additional code. */ + return -1; + } + if (test_thread_flag(TIF_SYSCALL_TRACE) && tracehook_report_syscall_entry(regs)) ret = -1L; |