From: will.deacon@arm•com (Will Deacon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm64: fix missing syscall trace exit
Date: Wed, 3 Jun 2015 10:52:41 +0100 [thread overview]
Message-ID: <20150603095241.GD17581@arm.com> (raw)
In-Reply-To: <556E5454.9080400@redhat.com>
On Wed, Jun 03, 2015 at 02:11:48AM +0100, Josh Stone wrote:
> On 06/02/2015 06:01 PM, Josh Stone wrote:
> > If a syscall is entered without TIF_SYSCALL_TRACE set, then it goes on
> > the fast path. It's then possible to have TIF_SYSCALL_TRACE added in
> > the middle of the syscall, but ret_fast_syscall doesn't check this flag
> > again. This causes a ptrace syscall-exit-stop to be missed.
> >
> > For instance, from a PTRACE_EVENT_FORK reported during do_fork, the
> > tracer might resume with PTRACE_SYSCALL, setting TIF_SYSCALL_TRACE.
> > Now the completion of the fork should have a syscall-exit-stop.
> >
> > Russell King fixed this on arm by re-checking _TIF_SYSCALL_WORK in the
> > fast exit path. Do the same on arm64.
> >
> > Cc: Catalin Marinas <catalin.marinas@arm•com>
> > Cc: Will Deacon <will.deacon@arm•com>
> > Cc: Russell King <rmk@arm•linux.org.uk>
> > Signed-off-by: Josh Stone <jistone@redhat•com>
> > ---
> > arch/arm64/kernel/entry.S | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
> > index 959fe8733560..a547a3e8a198 100644
> > --- a/arch/arm64/kernel/entry.S
> > +++ b/arch/arm64/kernel/entry.S
> > @@ -608,7 +608,9 @@ ENDPROC(cpu_switch_to)
> > */
> > ret_fast_syscall:
> > disable_irq // disable interrupts
> > - ldr x1, [tsk, #TI_FLAGS]
> > + ldr x1, [tsk, #TI_FLAGS] // re-check for syscall tracing
> > + and x2, x1, #_TIF_SYSCALL_WORK
> > + cbnz x2, __sys_trace_return
> > and x2, x1, #_TIF_WORK_MASK
> > cbnz x2, fast_work_pending
> > enable_step_tsk x1, x2
>
> I do have one concern about this, also in Russell's ARM patch. Is it
> really ok to branch to __sys_trace_return with interrupts disabled?
I think you're right to be concerned!
> I didn't hit any issue from that, but my testcase only exercises this
> path once each run. So that might have just been lucky not to hit any
> gross scenario...
Did you try enabling all the audit stuff? It looks like that can call
into the scheduler, so I think we should be running the tracing callbacks
with interrupts enabled (and it looks like x86 do this on the exit path).
Will
next prev parent reply other threads:[~2015-06-03 9:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 19:13 arm syscall fast path can miss a ptrace syscall-exit Josh Stone
2015-05-14 19:35 ` Russell King - ARM Linux
2015-05-14 21:08 ` Josh Stone
2015-05-26 22:38 ` Josh Stone
2015-05-28 10:37 ` Russell King - ARM Linux
2015-05-29 20:13 ` Josh Stone
2015-06-01 10:24 ` Will Deacon
2015-06-03 1:01 ` [PATCH] arm64: fix missing syscall trace exit Josh Stone
2015-06-03 1:11 ` Josh Stone
2015-06-03 9:52 ` Will Deacon [this message]
2015-06-03 20:03 ` Josh Stone
2015-06-04 10:06 ` Russell King - ARM Linux
2015-06-04 17:14 ` Josh Stone
2015-06-04 23:17 ` Josh Stone
2015-06-05 15:38 ` Will Deacon
2015-06-05 17:52 ` Tom Lendacky
2015-06-05 21:28 ` Josh Stone
2015-06-08 10:21 ` Will Deacon
2015-06-08 16:37 ` Josh Stone
2015-06-08 16:43 ` Catalin Marinas
2015-06-23 0:08 ` [PATCH] ARM: enable_irq before ret_fast_syscall tracing Josh Stone
2015-06-23 0:15 ` Josh Stone
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=20150603095241.GD17581@arm.com \
--to=will.deacon@arm$(echo .)com \
--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