From: Will Drewry <wad@chromium.org>
To: Oleg Nesterov <oleg@redhat.com>
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com,
netdev@vger.kernel.org, x86@kernel.org, arnd@arndb.de,
davem@davemloft.net, hpa@zytor.com, mingo@redhat.com,
peterz@infradead.org, rdunlap@xenotime.net,
mcgrathr@chromium.org, tglx@linutronix.de, luto@mit.edu,
eparis@redhat.com, serge.hallyn@canonical.com, djm@mindrot.org,
scarybeasts@gmail.com, indan@nul.nu, pmoore@redhat.com,
akpm@linux-foundation.org, corbet@lwn.net,
eric.dumazet@gmail.com, markus@chromium.org,
coreyb@linux.vnet.ibm.com, keescook@chromium.org,
Denys Vlasenko <dvlasenk@redhat.com>
Subject: Re: [PATCH v11 10/12] ptrace,seccomp: Add PTRACE_SECCOMP support
Date: Tue, 28 Feb 2012 11:04:01 -0600 [thread overview]
Message-ID: <CABqD9hY7=DpxWzf3+WNsK=LuLrabf=oHxyy+CQgu0JLxZ80zPQ@mail.gmail.com> (raw)
In-Reply-To: <20120228164335.GC3664@redhat.com>
On Tue, Feb 28, 2012 at 10:43 AM, Oleg Nesterov <oleg@redhat.com> wrote:
> On 02/27, Will Drewry wrote:
>> On Mon, Feb 27, 2012 at 11:54 AM, Oleg Nesterov <oleg@redhat.com> wrote:
>> > On 02/24, Will Drewry wrote:
>> >>
>> >> arch/Kconfig | 1 +
>> >> include/linux/ptrace.h | 7 +++++--
>> >> include/linux/seccomp.h | 4 +++-
>> >> include/linux/tracehook.h | 6 ++++++
>> >> kernel/ptrace.c | 4 ++++
>> >> kernel/seccomp.c | 18 ++++++++++++++++++
>> >
>> > FYI, this conflicts with the changes -mm tree.
>> >
>> > The changes in ptrace.* confict with Denys's
>> > "ptrace: simplify PTRACE_foo constants and PTRACE_SETOPTIONS code"
>> >
>> > The change in tracehook.h conflicts with
>> > "ptrace: the killed tracee should not enter the syscall"
>>
>> What's the best way to reconcile this in this day and age?
>
> Of course I'd prefer if you make this change on top of Denys's patch ;)
>
> Besides, if you agree with PTRACE_EVENT_SECCOMP/PTRACE_O_SECCOMP you
> need only one trivial change in ptrace.h.
I think that works quite well :)
>> I don't see
>> these in kernel-next yet and I can't tell if there is a public -mm
>> anywhere anymore.
>
> Strange... I didn't check, but every patch in
> http://marc.info/?l=linux-mm-commits has this note:
>
> The -mm tree is included into linux-next and is updated
> there every 3-4 working days
It appears to have been pulled in ~8 hours ago. I'm rebasing to next now.
>> >> --- a/kernel/seccomp.c
>> >> +++ b/kernel/seccomp.c
>> >> @@ -354,6 +354,24 @@ int __secure_computing_int(int this_syscall)
>> >> seccomp_send_sigsys(this_syscall, reason_code);
>> >> return -1;
>> >> }
>> >> + case SECCOMP_RET_TRACE: {
>> >> + int ret;
>> >> + struct pt_regs *regs = task_pt_regs(current);
>> >> + if (!(test_tsk_thread_flag(current, TIF_SYSCALL_TRACE)) ||
>> >> + !(current->ptrace & PT_TRACE_SECCOMP))
>> >> + return -1;
>> >> + /*
>> >> + * PT_TRACE_SECCOMP and seccomp.trace indicate whether
>> >> + * tracehook_report_syscall_entry needs to signal the
>> >> + * tracer. This avoids race conditions in hand off and
>> >> + * the requirement for TIF_SYSCALL_TRACE ensures that
>> >> + * we are in the syscall slow path.
>> >> + */
>> >> + current->seccomp.trace = 1;
>> >> + ret = tracehook_report_syscall_entry(regs);
>> >> + current->seccomp.trace = 0;
>> >> + return ret;
>> >
>> > To be honest, this interface looks a bit strange to me...
>> >
>> > Once again, sorry if this was already discussed. But perhaps it would
>> > be better to introduce PTRACE_EVENT_SECCOMP/PTRACE_O_SECCOMP instead?
>> >
>> > SECCOMP_RET_TRACE: could simply do ptrace_event(PTRACE_EVENT_SECCOMP)
>> > unconditionaly. The tracer can set the option and do PTRACE_CONT if it
>> > doesn't want the system call notifications.
>>
>> Works for me - this also gets rid of the extra int for brief state
>> tracking. I'll switch over to that in the next rev.
>
> Great. In this case this patch becomes really trivial. Just 2 defines
> in ptrace.h and the unconditional ptrace_event() under SECCOMP_RET_TRACE.
>
> But probably you should check fatal_signal_pending(current) after
> ptrace_event() returns, ptrace_event() returns void.
Ah yeah - I don't want to reintroduce that issue :)
Thanks!
next prev parent reply other threads:[~2012-02-28 17:04 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-25 3:21 [PATCH v11 01/12] sk_run_filter: add support for custom load_pointer Will Drewry
2012-02-25 3:21 ` [PATCH v11 02/12] net/compat.c,linux/filter.h: share compat_sock_fprog Will Drewry
2012-02-25 3:21 ` [PATCH v11 03/12] seccomp: kill the seccomp_t typedef Will Drewry
2012-02-25 3:21 ` [PATCH v11 04/12] asm/syscall.h: add syscall_get_arch Will Drewry
2012-02-25 3:21 ` [PATCH v11 05/12] arch/x86: add syscall_get_arch to syscall.h Will Drewry
2012-02-25 3:21 ` [PATCH v11 06/12] seccomp: add system call filtering using BPF Will Drewry
2012-02-26 20:28 ` Kees Cook
2012-02-27 16:23 ` Will Drewry
2012-02-27 16:49 ` Eric Paris
2012-02-27 18:55 ` Kees Cook
2012-02-27 19:25 ` Eric Paris
2012-02-27 20:00 ` Kees Cook
2012-02-27 20:34 ` Eric Paris
2012-02-27 20:49 ` Kees Cook
2012-02-27 17:09 ` Oleg Nesterov
2012-02-27 19:54 ` Will Drewry
2012-02-27 20:15 ` Kees Cook
2012-02-28 15:13 ` Oleg Nesterov
2012-02-28 17:18 ` Will Drewry
2012-02-28 6:51 ` Indan Zupancic
2012-02-28 7:52 ` Kees Cook
2012-02-28 17:17 ` Will Drewry
2012-02-28 17:47 ` Markus Gutschke
2012-02-25 3:21 ` [PATCH v11 07/12] seccomp: add SECCOMP_RET_ERRNO Will Drewry
2012-02-25 20:20 ` Kees Cook
2012-02-27 16:22 ` Will Drewry
2012-02-27 17:11 ` Oleg Nesterov
2012-02-27 18:09 ` Kees Cook
2012-02-27 18:14 ` Oleg Nesterov
2012-02-27 18:35 ` Andrew Lutomirski
2012-02-27 19:14 ` Kees Cook
2012-02-27 19:54 ` Will Drewry
2012-02-25 3:21 ` [PATCH v11 08/12] signal, x86: add SIGSYS info and make it synchronous Will Drewry
2012-02-27 17:22 ` Oleg Nesterov
2012-02-27 17:34 ` Roland McGrath
2012-02-27 18:08 ` Oleg Nesterov
2012-02-27 20:24 ` Will Drewry
2012-02-28 16:02 ` Oleg Nesterov
2012-02-28 17:06 ` Will Drewry
2012-02-25 3:21 ` [PATCH v11 09/12] seccomp: Add SECCOMP_RET_TRAP Will Drewry
2012-02-25 3:21 ` [PATCH v11 10/12] ptrace,seccomp: Add PTRACE_SECCOMP support Will Drewry
2012-02-27 17:54 ` Oleg Nesterov
2012-02-27 19:47 ` Will Drewry
2012-02-28 16:43 ` Oleg Nesterov
2012-02-28 17:04 ` Will Drewry [this message]
2012-02-28 18:34 ` Will Drewry
2012-02-29 16:14 ` Oleg Nesterov
2012-02-29 16:33 ` Will Drewry
2012-02-29 17:09 ` Oleg Nesterov
2012-02-29 17:41 ` Roland McGrath
2012-02-29 17:51 ` Will Drewry
2012-02-25 3:21 ` [PATCH v11 11/12] x86: Enable HAVE_ARCH_SECCOMP_FILTER Will Drewry
2012-02-25 3:21 ` [PATCH v11 12/12] Documentation: prctl/seccomp_filter Will Drewry
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='CABqD9hY7=DpxWzf3+WNsK=LuLrabf=oHxyy+CQgu0JLxZ80zPQ@mail.gmail.com' \
--to=wad@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=coreyb@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=djm@mindrot.org \
--cc=dvlasenk@redhat.com \
--cc=eparis@redhat.com \
--cc=eric.dumazet@gmail.com \
--cc=hpa@zytor.com \
--cc=indan@nul.nu \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@mit.edu \
--cc=markus@chromium.org \
--cc=mcgrathr@chromium.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=pmoore@redhat.com \
--cc=rdunlap@xenotime.net \
--cc=scarybeasts@gmail.com \
--cc=serge.hallyn@canonical.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).