From: Will Deacon <will@kernel.org>
To: Keno Fischer <keno@juliacomputing.com>
Cc: catalin.marinas@arm.com, will.deacon@arm.com,
linux-kernel@vger.kernel.org, oleg@redhat.com,
sudeep.holla@arm.com, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] arm64: Fix PTRACE_SYSEMU semantics
Date: Mon, 18 May 2020 12:41:20 +0100 [thread overview]
Message-ID: <20200518114119.GB32394@willie-the-truck> (raw)
In-Reply-To: <20200515222253.GA38408@juliacomputing.com>
On Fri, May 15, 2020 at 06:22:53PM -0400, Keno Fischer wrote:
> Quoth the man page:
> ```
> If the tracee was restarted by PTRACE_SYSCALL or PTRACE_SYSEMU, the
> tracee enters syscall-enter-stop just prior to entering any system
> call (which will not be executed if the restart was using
> PTRACE_SYSEMU, regardless of any change made to registers at this
> point or how the tracee is restarted after this stop).
> ```
>
> The parenthetical comment is currently true on x86 and powerpc,
> but not currently true on arm64. arm64 re-checks the _TIF_SYSCALL_EMU
> flag after the syscall entry ptrace stop. However, at this point,
> it reflects which method was used to re-start the syscall
> at the entry stop, rather than the method that was used to reach it.
> Fix that by recording the original flag before performing the ptrace
> stop, bringing the behavior in line with documentation and x86/powerpc.
>
> Signed-off-by: Keno Fischer <keno@juliacomputing.com>
> ---
> arch/arm64/kernel/ptrace.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
> index b3d3005d9515..b67b4d14aa17 100644
> --- a/arch/arm64/kernel/ptrace.c
> +++ b/arch/arm64/kernel/ptrace.c
> @@ -1829,10 +1829,12 @@ static void tracehook_report_syscall(struct pt_regs *regs,
>
> int syscall_trace_enter(struct pt_regs *regs)
> {
> - if (test_thread_flag(TIF_SYSCALL_TRACE) ||
> - test_thread_flag(TIF_SYSCALL_EMU)) {
> + u32 flags = READ_ONCE(current_thread_info()->flags) &
> + (_TIF_SYSCALL_EMU | _TIF_SYSCALL_TRACE);
> +
> + if (flags) {
nit: but I'd rather the '&' operation was in the conditional so that the
'flags' variable holds all of the flags.
With that:
Acked-by: Will Deacon <will@kernel.org>
Also needs:
Cc: <stable@vger.kernel.org>
Fixes: f086f67485c5 ("arm64: ptrace: add support for syscall emulation")
Catalin -- can you pick this up for 5.7 please, with my 'nit' addressed?
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-05-18 11:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 22:22 [PATCH] arm64: Fix PTRACE_SYSEMU semantics Keno Fischer
2020-05-18 11:41 ` Will Deacon [this message]
2020-05-19 12:07 ` Catalin Marinas
2020-05-20 10:03 ` Sudeep Holla
2020-05-20 10:05 ` Catalin Marinas
2020-05-20 10:07 ` 回复: " Bin Lu
2020-05-20 10:34 ` Bin Lu
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=20200518114119.GB32394@willie-the-truck \
--to=will@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=keno@juliacomputing.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=sudeep.holla@arm.com \
--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;
as well as URLs for NNTP newsgroup(s).