From: takahiro.akashi@linaro•org (AKASHI Takahiro)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm64: make a single hook to syscall_trace() for all syscall features
Date: Wed, 19 Feb 2014 20:53:16 +0900 [thread overview]
Message-ID: <53049B2C.6070105@linaro.org> (raw)
In-Reply-To: <20140217173522.GD26590@mudshark.cambridge.arm.com>
Hi,
On 02/18/2014 02:35 AM, Will Deacon wrote:
> On Fri, Feb 07, 2014 at 10:07:31AM +0000, AKASHI Takahiro wrote:
>> Currently syscall_trace() is called only for ptrace.
>> With additional TIF_xx flags introduced, it is now called in all the cases
>> of audit, ftrace and seccomp in addition to ptrace.
>> Those features will be implemented later, but it's safe to include them
>> now because they can not be turned on anyway.
>>
>> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro•org>
>> ---
>> arch/arm64/include/asm/thread_info.h | 13 +++++++++++++
>> arch/arm64/kernel/entry.S | 5 +++--
>> arch/arm64/kernel/ptrace.c | 11 +++++------
>> 3 files changed, 21 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
>> index 720e70b..c3df797 100644
>> --- a/arch/arm64/include/asm/thread_info.h
>> +++ b/arch/arm64/include/asm/thread_info.h
>
> [...]
>
>> +#define _TIF_WORK_SYSCALL (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
>> + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
>
> This is called _TIF_SYSCALL_WORK on arch/arm/, any reason not to follow the
> naming convention here?
This is called _TIF_WORK_SYSCALL on arch/x86 :-)
That is the only reason, and so I don't have any objection to following arm
if you prefer it.
>> #endif /* __KERNEL__ */
>> #endif /* __ASM_THREAD_INFO_H */
>> diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
>> index 39ac630..c94b2ab 100644
>> --- a/arch/arm64/kernel/entry.S
>> +++ b/arch/arm64/kernel/entry.S
>> @@ -631,8 +631,9 @@ el0_svc_naked: // compat entry point
>> enable_irq
>>
>> get_thread_info tsk
>> - ldr x16, [tsk, #TI_FLAGS] // check for syscall tracing
>> - tbnz x16, #TIF_SYSCALL_TRACE, __sys_trace // are we tracing syscalls?
>> + ldr x16, [tsk, #TI_FLAGS] // check for syscall hooks
>> + tst x16, #_TIF_WORK_SYSCALL
>> + b.ne __sys_trace
>> adr lr, ret_fast_syscall // return address
>> cmp scno, sc_nr // check upper syscall limit
>> b.hs ni_sys
>> diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
>> index 6a8928b..64ce39f 100644
>> --- a/arch/arm64/kernel/ptrace.c
>> +++ b/arch/arm64/kernel/ptrace.c
>> @@ -1062,9 +1062,6 @@ asmlinkage int syscall_trace(int dir, struct pt_regs *regs)
>> {
>> unsigned long saved_reg;
>>
>> - if (!test_thread_flag(TIF_SYSCALL_TRACE))
>> - return regs->syscallno;
>
> This doesn't look right for things like audit (where we don't want to report
> the syscall if only _TIF_SYSCALL_AUDIT is set, for example).
Yeah, it is my screwup.
I will add the guards against TIF_SYSCALL_TRACE (for ptrace),
TIF_SYSCALL_TRACEPOINT (for ftrace) and TIF_SYSCALL_AUDIT (for audit).
secure_computing() is protected in itself.
>> if (is_compat_task()) {
>> /* AArch32 uses ip (r12) for scratch */
>> saved_reg = regs->regs[12];
>> @@ -1078,10 +1075,12 @@ asmlinkage int syscall_trace(int dir, struct pt_regs *regs)
>> regs->regs[7] = dir;
>> }
>>
>> - if (dir)
>> + if (dir) {
>> tracehook_report_syscall_exit(regs, 0);
>> - else if (tracehook_report_syscall_entry(regs))
>> - regs->syscallno = ~0UL;
>> + } else {
>> + if (tracehook_report_syscall_entry(regs))
>> + regs->syscallno = ~0UL;
>> + }
>
> This hunk doesn't do anything.
Well, this is just a change for future patches, but
I will remove it anyway due to the guards mentioned above.
-Takahiro AKASHI
> Will
>
next prev parent reply other threads:[~2014-02-19 11:53 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-06 10:25 [PATCH 0/4] arm64: Add audit support AKASHI Takahiro
2013-11-06 10:25 ` [PATCH 1/4] audit: Enable arm64 support AKASHI Takahiro
2013-11-06 10:25 ` [PATCH 2/4] arm64: Add audit support AKASHI Takahiro
2013-11-08 14:43 ` Will Deacon
2013-11-11 6:48 ` AKASHI Takahiro
2013-11-06 10:25 ` [PATCH 3/4] arm64: audit: Add AArch32 support AKASHI Takahiro
2013-11-08 14:55 ` Will Deacon
2013-11-11 7:40 ` AKASHI Takahiro
2013-11-06 10:25 ` [PATCH 4/4] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2013-11-08 14:34 ` [PATCH 0/4] arm64: Add audit support Will Deacon
2013-11-11 6:38 ` AKASHI Takahiro
2014-01-17 8:13 ` [PATCH v2 0/6] " AKASHI Takahiro
2014-01-17 8:13 ` [PATCH v2 1/6] audit: Enable arm64 support AKASHI Takahiro
2014-01-23 14:18 ` Catalin Marinas
2014-01-27 5:12 ` AKASHI Takahiro
2014-01-27 14:49 ` Catalin Marinas
2014-01-29 20:21 ` Richard Guy Briggs
2014-01-29 22:36 ` Richard Guy Briggs
2014-02-03 5:59 ` AKASHI Takahiro
2014-02-03 16:06 ` Richard Guy Briggs
2014-02-04 16:25 ` Richard Guy Briggs
2014-02-03 6:00 ` [PATCH] audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL AKASHI Takahiro
2014-02-25 9:16 ` [PATCH v2 0/1] " AKASHI Takahiro
2014-02-25 9:16 ` [PATCH v2 1/1] " AKASHI Takahiro
2014-02-25 14:53 ` Will Deacon
2014-02-25 15:25 ` Richard Guy Briggs
2014-02-25 17:40 ` Matt Turner
2014-02-26 12:31 ` Michael Ellerman
2014-01-17 8:13 ` [PATCH v2 2/6] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-01-17 8:13 ` [PATCH v2 3/6] arm64: Add audit support AKASHI Takahiro
2014-01-17 8:13 ` [PATCH v2 4/6] arm64: audit: Add 32-bit (compat) syscall support AKASHI Takahiro
2014-01-17 16:46 ` Will Deacon
2014-01-20 5:23 ` AKASHI Takahiro
2014-01-17 8:13 ` [PATCH v2 5/6] arm64: audit: Add makefile rule to create unistd_32.h for compat syscalls AKASHI Takahiro
2014-01-23 14:53 ` Catalin Marinas
2014-01-27 6:13 ` AKASHI Takahiro
2014-01-17 8:13 ` [PATCH v2 6/6] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-01-23 14:56 ` Catalin Marinas
2014-01-17 19:44 ` [PATCH v2 0/6] arm64: Add audit support Richard Guy Briggs
2014-02-03 6:56 ` [PATCH v3 0/3] " AKASHI Takahiro
2014-02-03 6:56 ` [PATCH v3 1/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-02-04 17:30 ` Will Deacon
2014-02-03 6:56 ` [PATCH v3 2/3] arm64: Add audit support AKASHI Takahiro
2014-02-04 17:30 ` Will Deacon
2014-02-03 6:56 ` [PATCH v3 3/3] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-04 17:31 ` Will Deacon
2014-02-05 1:54 ` AKASHI Takahiro
2014-02-07 10:07 ` [PATCH] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-02-11 13:49 ` Richard Guy Briggs
2014-02-17 17:35 ` Will Deacon
2014-02-19 11:53 ` AKASHI Takahiro [this message]
2014-02-25 9:14 ` [PATCH v2 0/1] " AKASHI Takahiro
2014-02-25 9:14 ` [PATCH v2 1/1] " AKASHI Takahiro
2014-02-25 15:00 ` Will Deacon
2014-02-26 2:00 ` AKASHI Takahiro
2014-02-26 11:25 ` Will Deacon
2014-02-27 1:33 ` AKASHI Takahiro
2014-02-28 5:14 ` [PATCH v3 0/2] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-02-28 5:14 ` [PATCH v3 1/2] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-02-28 15:57 ` Will Deacon
2014-02-28 5:14 ` [PATCH v3 2/2] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-03-13 10:11 ` [PATCH v4 0/3] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-03-13 10:11 ` [PATCH v4 1/3] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-03-13 18:28 ` Will Deacon
2014-03-13 10:11 ` [PATCH v4 2/3] arm64: split syscall_trace() into separate functions for enter/exit AKASHI Takahiro
2014-03-13 18:41 ` Will Deacon
2014-03-14 16:51 ` AKASHI Takahiro
2014-03-13 10:11 ` [PATCH v4 3/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-03-15 5:39 ` [PATCH v5 0/4] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-03-15 5:39 ` [PATCH v5 1/4] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-03-15 5:39 ` [PATCH v5 2/4] arm64: split syscall_trace() into separate functions for enter/exit AKASHI Takahiro
2014-03-16 19:46 ` Richard Guy Briggs
2014-04-16 13:27 ` Will Deacon
2014-04-28 9:58 ` AKASHI Takahiro
2014-03-15 5:39 ` [PATCH v5 3/4] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-03-15 5:39 ` [PATCH v5 4/4] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-03-16 19:48 ` Richard Guy Briggs
2014-04-16 13:29 ` Will Deacon
2014-04-30 9:51 ` [PATCH v6 0/4] arm64: prerequisites for audit and ftrace AKASHI Takahiro
2014-04-30 9:51 ` [PATCH v6 1/4] arm64: make a single hook to syscall_trace() for all syscall features AKASHI Takahiro
2014-04-30 9:51 ` [PATCH v6 2/4] arm64: split syscall_trace() into separate functions for enter/exit AKASHI Takahiro
2014-04-30 9:51 ` [PATCH v6 3/4] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-04-30 9:51 ` [PATCH v6 4/4] arm64: is_compat_task is defined both in asm/compat.h and linux/compat.h AKASHI Takahiro
2014-05-12 15:52 ` [PATCH v6 0/4] arm64: prerequisites for audit and ftrace Catalin Marinas
2014-02-07 10:10 ` [PATCH v4 0/3] arm64: Add audit support AKASHI Takahiro
2014-02-07 10:10 ` [PATCH v4 1/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-02-07 10:10 ` [PATCH v4 2/3] arm64: Add audit support AKASHI Takahiro
2014-02-07 10:10 ` [PATCH v4 3/3] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-17 17:42 ` Will Deacon
2014-02-11 13:51 ` [PATCH v4 0/3] arm64: Add audit support Richard Guy Briggs
2014-02-25 9:18 ` [PATCH v5 " AKASHI Takahiro
2014-02-25 9:18 ` [PATCH v5 1/3] arm64: Add regs_return_value() in syscall.h AKASHI Takahiro
2014-02-25 9:18 ` [PATCH v5 2/3] arm64: Add audit support AKASHI Takahiro
2014-02-25 9:18 ` [PATCH v5 3/3] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-28 5:17 ` [PATCH v6 0/2] arm64: Add audit support AKASHI Takahiro
2014-02-28 5:17 ` [PATCH v6 1/2] " AKASHI Takahiro
2014-03-05 2:50 ` Richard Guy Briggs
2014-03-06 2:21 ` AKASHI Takahiro
2014-02-28 5:17 ` [PATCH v6 2/2] arm64: audit: Add audit hook in ptrace/syscall_trace AKASHI Takahiro
2014-02-28 16:15 ` Will Deacon
2014-02-28 20:45 ` Richard Guy Briggs
2014-03-06 2:10 ` AKASHI Takahiro
2014-03-06 2:55 ` Richard Guy Briggs
2014-03-13 10:16 ` [PATCH v7 0/2] arm64: Add audit support AKASHI Takahiro
2014-03-13 10:16 ` [PATCH v7 1/2] " AKASHI Takahiro
2014-03-13 10:16 ` [PATCH v7 2/2] arm64: audit: Add audit hook in syscall_trace_enter/exit() AKASHI Takahiro
2014-03-13 18:43 ` Will Deacon
2014-03-15 5:49 ` [PATCH_v8 0/2] arm64: Add audit support AKASHI Takahiro
2014-03-15 5:49 ` [PATCH_v8 1/2] " AKASHI Takahiro
2014-03-15 5:49 ` [PATCH_v8 2/2] arm64: audit: Add audit hook in syscall_trace_enter/exit() AKASHI Takahiro
2014-04-16 11:30 ` Will Deacon
2014-04-28 9:55 ` AKASHI Takahiro
2014-04-11 21:37 ` [PATCH_v8 0/2] arm64: Add audit support Don Dutile
2014-04-28 9:51 ` AKASHI Takahiro
2014-04-28 22:25 ` Don Dutile
2014-04-30 9:57 ` [PATCH v9 " AKASHI Takahiro
2014-04-30 9:57 ` [PATCH v9 1/2] " AKASHI Takahiro
2014-04-30 9:57 ` [PATCH v9 2/2] arm64: audit: Add audit hook in syscall_trace_enter/exit() 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=53049B2C.6070105@linaro.org \
--to=takahiro.akashi@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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