From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Kees Cook <keescook@chromium.org>
Cc: linux-kernel@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
Will Drewry <wad@chromium.org>,
Geremy Condra <gcondra@google.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>
Subject: Re: [PATCH 2/4] arch/arm: move secure_computing into trace
Date: Thu, 1 Nov 2012 20:33:38 +0000 [thread overview]
Message-ID: <20121101203338.GU21164@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1351799199-6853-3-git-send-email-keescook@chromium.org>
On Thu, Nov 01, 2012 at 12:46:37PM -0700, Kees Cook wrote:
> #ifdef CONFIG_SECCOMP
> - tst r10, #_TIF_SECCOMP
> - beq 1f
> - mov r0, scno
> - bl __secure_computing
> - add r0, sp, #S_R0 + S_OFF @ pointer to regs
> - ldmia r0, {r0 - r3} @ have to reload r0 - r3
> -1:
> + tst r10, #_TIF_SECCOMP @ is seccomp enabled?
> + bne __sys_trace
> #endif
>
> tst r10, #_TIF_SYSCALL_WORK @ are we tracing syscalls?
It's pointless having:
tst r10, #_TIF_SECCOMP
bne __sys_trace
tst r10, #_TIF_SYSCALL_WORK
bne __sys_trace
Instead, make TIF_SECCOMP be bit 11, combine it into _TIF_SYSCALL_WORK, and
eliminate all of that CONFIG_SECCOMP block.
> diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
> index 739db3a..6b0e14b 100644
> --- a/arch/arm/kernel/ptrace.c
> +++ b/arch/arm/kernel/ptrace.c
> @@ -916,13 +916,15 @@ enum ptrace_syscall_dir {
> PTRACE_SYSCALL_EXIT,
> };
>
> -static int ptrace_syscall_trace(struct pt_regs *regs, int scno,
> - enum ptrace_syscall_dir dir)
> +asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
> {
> unsigned long ip;
>
> current_thread_info()->syscall = scno;
>
> + if (secure_computing(scno) == -1)
> + return -1;
> +
> if (!test_thread_flag(TIF_SYSCALL_TRACE))
> return scno;
I'm not sure this change is correct (combined with your hunk below).
What if we have auditing enabled but trace disabled? How do we reach
audit_syscall_entry()? Or the tracehook stuff?
This patch looks wrong in too many ways.
> @@ -931,20 +933,13 @@ static int ptrace_syscall_trace(struct pt_regs *regs, int scno,
> * IP = 0 -> entry, =1 -> exit
> */
> ip = regs->ARM_ip;
> - regs->ARM_ip = dir;
> -
> - if (dir == PTRACE_SYSCALL_EXIT)
> - tracehook_report_syscall_exit(regs, 0);
> - else if (tracehook_report_syscall_entry(regs))
> + regs->ARM_ip = PTRACE_SYSCALL_ENTER;
> + if (tracehook_report_syscall_entry(regs))
> current_thread_info()->syscall = -1;
> -
> regs->ARM_ip = ip;
> - return current_thread_info()->syscall;
> -}
>
> -asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
> -{
> - scno = ptrace_syscall_trace(regs, scno, PTRACE_SYSCALL_ENTER);
> + scno = current_thread_info()->syscall;
> +
> if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
> trace_sys_enter(regs, scno);
> audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0, regs->ARM_r1,
> @@ -954,7 +949,23 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
>
> asmlinkage int syscall_trace_exit(struct pt_regs *regs, int scno)
> {
> - scno = ptrace_syscall_trace(regs, scno, PTRACE_SYSCALL_EXIT);
> + unsigned long ip;
> +
> + current_thread_info()->syscall = scno;
> +
> + if (!test_thread_flag(TIF_SYSCALL_TRACE))
> + return scno;
> +
> + /*
> + * IP is used to denote syscall entry/exit:
> + * IP = 0 -> entry, =1 -> exit
> + */
> + ip = regs->ARM_ip;
> + regs->ARM_ip = PTRACE_SYSCALL_EXIT;
> + tracehook_report_syscall_exit(regs, 0);
> + regs->ARM_ip = ip;
> +
> + scno = current_thread_info()->syscall;
> if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
> trace_sys_exit(regs, scno);
> audit_syscall_exit(regs);
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-11-01 20:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 19:46 [PATCH v2 0/4] arch/arm: support seccomp Kees Cook
2012-11-01 19:46 ` [PATCH 1/4] arch/arm: add syscall_get_arch Kees Cook
2012-11-01 19:46 ` [PATCH 2/4] arch/arm: move secure_computing into trace Kees Cook
2012-11-01 20:33 ` Russell King - ARM Linux [this message]
2012-11-01 20:50 ` Kees Cook
2012-11-01 19:46 ` [PATCH 3/4] arch/arm: allow a scno of -1 to not cause a SIGILL Kees Cook
2012-11-01 20:25 ` Russell King - ARM Linux
2012-11-01 21:51 ` Kees Cook
2012-11-01 19:46 ` [PATCH 4/4] arch/arm: select HAVE_ARCH_SECCOMP_FILTER Kees Cook
-- strict thread matches above, loose matches on Subject: below --
2012-11-10 22:44 [PATCH v5 0/4] arch/arm: support seccomp Kees Cook
2012-11-10 22:44 ` [PATCH 2/4] arch/arm: move secure_computing into trace Kees Cook
2012-11-08 20:59 [PATCH v4 0/4] arch/arm: support seccomp Kees Cook
2012-11-08 20:59 ` [PATCH 2/4] arch/arm: move secure_computing into trace Kees Cook
2012-11-09 11:56 ` Will Deacon
2012-11-02 0:14 [PATCH v3 0/4] arch/arm: support seccomp Kees Cook
2012-11-02 0:14 ` [PATCH 2/4] arch/arm: move secure_computing into trace Kees Cook
2012-10-30 0:41 [PATCH 0/4] arch/arm: support seccomp Kees Cook
2012-10-30 0:41 ` [PATCH 2/4] arch/arm: move secure_computing into trace Kees Cook
2012-10-30 2:05 ` Al Viro
2012-10-31 0:13 ` Kees Cook
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=20121101203338.GU21164@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=catalin.marinas@arm.com \
--cc=gcondra@google.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=wad@chromium.org \
--cc=will.deacon@arm.com \
/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
Powered by JetHome