mbox series

[v2,0/2] ARM: ptrace: Restore syscall skipping and restart while tracing

Message ID 20230810195141.never.338-kees@kernel.org (mailing list archive)
Headers show
Series ARM: ptrace: Restore syscall skipping and restart while tracing | expand

Message

Kees Cook Aug. 10, 2023, 7:54 p.m. UTC
Hi,

Fix tracing on arm since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall:
always store thread_info->abi_syscall"). This was seen with the broken
seccomp tests "syscall_errno", "syscall_faked", and "syscall_restart".

Thanks!

-Kees

v2:
- split fixes
- move scno store into the actual restart path
v1: https://lore.kernel.org/lkml/20230804071045.never.134-kees@kernel.org

Kees Cook (2):
  ARM: ptrace: Restore syscall restart tracing
  ARM: ptrace: Restore syscall skipping for tracers

 arch/arm/include/asm/syscall.h | 3 +++
 arch/arm/kernel/entry-common.S | 1 +
 arch/arm/kernel/ptrace.c       | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

Comments

Kees Cook Aug. 11, 2023, 5:55 a.m. UTC | #1
On Thu, Aug 10, 2023 at 12:54:17PM -0700, Kees Cook wrote:
> Fix tracing on arm since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall:
> always store thread_info->abi_syscall"). This was seen with the broken
> seccomp tests "syscall_errno", "syscall_faked", and "syscall_restart".

I'd like to get this fixed in v6.5. Russell, do you have a fixes tree
that you'll be sending Linus's way before the next -rc? I can send it
via my seccomp-fixes tree if that'd be easier.

Thanks!

-Kees
Kees Cook Aug. 16, 2023, 8:59 p.m. UTC | #2
On Thu, 10 Aug 2023 12:54:17 -0700, Kees Cook wrote:
> Fix tracing on arm since commit 4e57a4ddf6b0 ("ARM: 9107/1: syscall:
> always store thread_info->abi_syscall"). This was seen with the broken
> seccomp tests "syscall_errno", "syscall_faked", and "syscall_restart".

Applied to for-next/seccomp, thanks!

[1/2] ARM: ptrace: Restore syscall restart tracing
      https://git.kernel.org/kees/c/cf007647475b
[2/2] ARM: ptrace: Restore syscall skipping for tracers
      https://git.kernel.org/kees/c/4697b5848bd9

Take care,