From: David Daney <david.daney@cavium.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mips@linux-mips.org, ralf@linux-mips.org
Cc: Markos Chandras <markos.chandras@imgtec.com>,
Matt Redfearn <matt.redfearn@imgtec.com>,
David Daney <david.daney@cavium.com>
Subject: [PATCH v2 5/5] MIPS: Give __secure_computing() access to syscall arguments.
Date: Tue, 13 Jun 2017 15:28:47 -0700 [thread overview]
Message-ID: <20170613222847.7122-6-david.daney@cavium.com> (raw)
In-Reply-To: <20170613222847.7122-1-david.daney@cavium.com>
KProbes of __seccomp_filter() are not very useful without access to
the syscall arguments.
Do what x86 does, and populate a struct seccomp_data to be passed to
__secure_computing(). This allows samples/bpf/tracex5 to extract a
sensible trace.
Signed-off-by: David Daney <david.daney@cavium.com>
---
arch/mips/kernel/ptrace.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 6931fe7..ba3b1f7 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -868,8 +868,26 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
tracehook_report_syscall_entry(regs))
return -1;
- if (secure_computing(NULL) == -1)
- return -1;
+#ifdef CONFIG_SECCOMP
+ if (unlikely(test_thread_flag(TIF_SECCOMP))) {
+ int ret, i;
+ struct seccomp_data sd;
+
+ sd.nr = syscall;
+ sd.arch = syscall_get_arch();
+ for (i = 0; i < 6; i++) {
+ unsigned long v, r;
+
+ r = mips_get_syscall_arg(&v, current, regs, i);
+ sd.args[i] = r ? 0 : v;
+ }
+ sd.instruction_pointer = KSTK_EIP(current);
+
+ ret = __secure_computing(&sd);
+ if (ret == -1)
+ return ret;
+ }
+#endif
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
trace_sys_enter(regs, regs->regs[2]);
--
2.9.4
next prev parent reply other threads:[~2017-06-13 22:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 22:28 [PATCH v2 0/5] MIPS: Implement eBPF JIT David Daney
2017-06-13 22:28 ` [PATCH v2 1/5] MIPS: Optimize uasm insn lookup David Daney
2017-06-13 22:28 ` [PATCH v2 2/5] MIPS: Correctly define DBSHFL type instruction opcodes David Daney
2017-06-13 22:28 ` [PATCH v2 3/5] MIPS: Add some instructions to uasm David Daney
2017-06-13 22:28 ` [PATCH v2 4/5] MIPS: Add support for eBPF JIT David Daney
2017-06-14 0:04 ` Daniel Borkmann
2017-06-13 22:28 ` David Daney [this message]
2017-06-14 9:48 ` [PATCH v2 0/5] MIPS: Implement " Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170613222847.7122-6-david.daney@cavium.com \
--to=david.daney@cavium.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=markos.chandras@imgtec.com \
--cc=matt.redfearn@imgtec.com \
--cc=netdev@vger.kernel.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).