linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: takahiro.akashi@linaro.org (AKASHI Takahiro)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 1/6] arm64: ptrace: add PTRACE_SET_SYSCALL
Date: Thu,  2 Oct 2014 18:46:11 +0900	[thread overview]
Message-ID: <1412243176-16192-2-git-send-email-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <1412243176-16192-1-git-send-email-takahiro.akashi@linaro.org>

To allow tracer to be able to change/skip a system call by re-writing
a syscall number, there are several approaches:

(1) modify x8 register with ptrace(PTRACE_SETREGSET), and handle this case
    later on in syscall_trace_enter(), or
(2) support ptrace(PTRACE_SET_SYSCALL) as on arm

Thinking of the fact that user_pt_regs doesn't expose 'syscallno' to
tracer as well as that secure_computing() expects a changed syscall number
to be visible, especially case of -1, before this function returns in
syscall_trace_enter(), we'd better take (2).

Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 arch/arm64/include/uapi/asm/ptrace.h |    1 +
 arch/arm64/kernel/ptrace.c           |   14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
index 6913643..49c6174 100644
--- a/arch/arm64/include/uapi/asm/ptrace.h
+++ b/arch/arm64/include/uapi/asm/ptrace.h
@@ -23,6 +23,7 @@
 
 #include <asm/hwcap.h>
 
+#define PTRACE_SET_SYSCALL	23
 
 /*
  * PSR bits
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index fe63ac5..2842f9f 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -1082,7 +1082,19 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
 long arch_ptrace(struct task_struct *child, long request,
 		 unsigned long addr, unsigned long data)
 {
-	return ptrace_request(child, request, addr, data);
+	int ret;
+
+	switch (request) {
+		case PTRACE_SET_SYSCALL:
+			task_pt_regs(child)->syscallno = data;
+			ret = 0;
+			break;
+		default:
+			ret = ptrace_request(child, request, addr, data);
+			break;
+	}
+
+	return ret;
 }
 
 enum ptrace_syscall_dir {
-- 
1.7.9.5

  reply	other threads:[~2014-10-02  9:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-02  9:46 [PATCH v7 0/6] arm64: add seccomp support AKASHI Takahiro
2014-10-02  9:46 ` AKASHI Takahiro [this message]
2014-10-08 14:13   ` [PATCH v7 1/6] arm64: ptrace: add PTRACE_SET_SYSCALL Will Deacon
2014-10-08 15:30     ` Kees Cook
2014-10-09  1:55       ` AKASHI Takahiro
2014-10-09  9:23       ` Will Deacon
2014-11-06  2:40         ` AKASHI Takahiro
2014-11-06 18:17           ` Kees Cook
2014-10-02  9:46 ` [PATCH v7 2/6] arm64: ptrace: allow tracer to skip a system call AKASHI Takahiro
2014-10-08 14:23   ` Will Deacon
2014-10-09  4:29     ` AKASHI Takahiro
2014-10-10 11:05       ` Will Deacon
2014-10-02  9:46 ` [PATCH v7 3/6] asm-generic: add generic seccomp.h for secure computing mode 1 AKASHI Takahiro
2014-10-02  9:46 ` [PATCH v7 4/6] arm64: add seccomp syscall for compat task AKASHI Takahiro
2014-10-02  9:46 ` [PATCH v7 5/6] arm64: add SIGSYS siginfo " AKASHI Takahiro
2014-10-08 14:30   ` Will Deacon
2014-10-09  2:25     ` AKASHI Takahiro
2014-10-02  9:46 ` [PATCH v7 6/6] arm64: add seccomp support AKASHI Takahiro

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=1412243176-16192-2-git-send-email-takahiro.akashi@linaro.org \
    --to=takahiro.akashi@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.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).