From nobody Sat Feb 7 15:09:45 2026 Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 80E89199920; Tue, 7 Jan 2025 23:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291043; cv=none; b=jS8rBqOVMHkfTbc0U2GNuE29eNYNULYwoc9TmjNVrL4uEgkv1ZpAmbDQ3ti9T4RXg1+OMv6kivyCqm9pB5J5Yb7LLRyXrUoNAlL3P7bF6qmQTQ9v5GpXhbqxLAJmuOvN7uGpfB0La19b0UJVn54LwtGatMWObFbXtaR1dMMQKJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291043; c=relaxed/simple; bh=Iz/Z7I9fB+pE6GKS9VlXJOP2CdhbMiLeNKFQ5ckB/eM=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=L2PlCEOdpQ2gqRGo833jRBXg7s2zJkJaAwLGEl37J6tnSYuPtTzWuUleF+6bGm2BFIFFzjBNuRduPRrVncOKVrzrLb8ZxM6yKnpF+xVslj2qmG3GrirNBPAM6LNHriPurK23jKnIZcNsIk95gFKoU1bOF97rY5i0sUqcye8pBYY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 517C872C8FB; Wed, 8 Jan 2025 02:04:00 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 404667CCB3A; Wed, 8 Jan 2025 01:04:00 +0200 (IST) Date: Wed, 8 Jan 2025 01:04:00 +0200 From: "Dmitry V. Levin" To: Oleg Nesterov Cc: Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, Dinh Nguyen , Jonas Bonn , Stefan Kristiansson , Stafford Horne , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Andreas Larsson , Richard Weinberger , Anton Ivanov , Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Chris Zankel , Max Filippov , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-openrisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org Subject: [PATCH 1/6] Revert "arch: remove unused function syscall_set_arguments()" Message-ID: <20250107230359.GA30633@strace.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250107230153.GA30560@strace.io> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" syscall_set_arguments() is going to be needed to implement PTRACE_SET_SYSCALL_INFO API. This is a partial revert: on a few architectures syscall_set_arguments() implementations were buggy, so instead of adding them here and applying fixes on top, cleaner implementations are coming in follow-up commits. This reverts commit 7962c2eddbfe7cce879acb06f9b4f205789e57b7. Signed-off-by: Dmitry V. Levin --- arch/nios2/include/asm/syscall.h | 11 ++++++++ arch/openrisc/include/asm/syscall.h | 7 ++++++ arch/powerpc/include/asm/syscall.h | 10 ++++++++ arch/riscv/include/asm/syscall.h | 9 +++++++ arch/s390/include/asm/syscall.h | 12 +++++++++ arch/sh/include/asm/syscall_32.h | 12 +++++++++ arch/sparc/include/asm/syscall.h | 10 ++++++++ arch/um/include/asm/syscall-generic.h | 14 +++++++++++ arch/x86/include/asm/syscall.h | 36 +++++++++++++++++++++++++++ arch/xtensa/include/asm/syscall.h | 11 ++++++++ include/asm-generic/syscall.h | 16 ++++++++++++ 11 files changed, 148 insertions(+) diff --git a/arch/nios2/include/asm/syscall.h b/arch/nios2/include/asm/sysc= all.h index fff52205fb65..526449edd768 100644 --- a/arch/nios2/include/asm/syscall.h +++ b/arch/nios2/include/asm/syscall.h @@ -58,6 +58,17 @@ static inline void syscall_get_arguments(struct task_str= uct *task, *args =3D regs->r9; } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, const unsigned long *args) +{ + regs->r4 =3D *args++; + regs->r5 =3D *args++; + regs->r6 =3D *args++; + regs->r7 =3D *args++; + regs->r8 =3D *args++; + regs->r9 =3D *args; +} + static inline int syscall_get_arch(struct task_struct *task) { return AUDIT_ARCH_NIOS2; diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/as= m/syscall.h index 903ed882bdec..e6383be2a195 100644 --- a/arch/openrisc/include/asm/syscall.h +++ b/arch/openrisc/include/asm/syscall.h @@ -57,6 +57,13 @@ syscall_get_arguments(struct task_struct *task, struct p= t_regs *regs, memcpy(args, ®s->gpr[3], 6 * sizeof(args[0])); } =20 +static inline void +syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, + const unsigned long *args) +{ + memcpy(®s->gpr[3], args, 6 * sizeof(args[0])); +} + static inline int syscall_get_arch(struct task_struct *task) { return AUDIT_ARCH_OPENRISC; diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/= syscall.h index 3dd36c5e334a..b2715448a660 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h @@ -110,6 +110,16 @@ static inline void syscall_get_arguments(struct task_s= truct *task, } } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + memcpy(®s->gpr[3], args, 6 * sizeof(args[0])); + + /* Also copy the first argument into orig_gpr3 */ + regs->orig_gpr3 =3D args[0]; +} + static inline int syscall_get_arch(struct task_struct *task) { if (is_tsk_32bit_task(task)) diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/sysc= all.h index 121fff429dce..8d389ba995c8 100644 --- a/arch/riscv/include/asm/syscall.h +++ b/arch/riscv/include/asm/syscall.h @@ -66,6 +66,15 @@ static inline void syscall_get_arguments(struct task_str= uct *task, memcpy(args, ®s->a1, 5 * sizeof(args[0])); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + regs->orig_a0 =3D args[0]; + args++; + memcpy(®s->a1, args, 5 * sizeof(regs->a1)); +} + static inline int syscall_get_arch(struct task_struct *task) { #ifdef CONFIG_64BIT diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscal= l.h index 27e3d804b311..b3dd883699e7 100644 --- a/arch/s390/include/asm/syscall.h +++ b/arch/s390/include/asm/syscall.h @@ -78,6 +78,18 @@ static inline void syscall_get_arguments(struct task_str= uct *task, args[0] =3D regs->orig_gpr2 & mask; } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + unsigned int n =3D 6; + + while (n-- > 0) + if (n > 0) + regs->gprs[2 + n] =3D args[n]; + regs->orig_gpr2 =3D args[0]; +} + static inline int syscall_get_arch(struct task_struct *task) { #ifdef CONFIG_COMPAT diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall= _32.h index d87738eebe30..cb51a7528384 100644 --- a/arch/sh/include/asm/syscall_32.h +++ b/arch/sh/include/asm/syscall_32.h @@ -57,6 +57,18 @@ static inline void syscall_get_arguments(struct task_str= uct *task, args[0] =3D regs->regs[4]; } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + regs->regs[1] =3D args[5]; + regs->regs[0] =3D args[4]; + regs->regs[7] =3D args[3]; + regs->regs[6] =3D args[2]; + regs->regs[5] =3D args[1]; + regs->regs[4] =3D args[0]; +} + static inline int syscall_get_arch(struct task_struct *task) { int arch =3D AUDIT_ARCH_SH; diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/sysc= all.h index 20c109ac8cc9..62a5a78804c4 100644 --- a/arch/sparc/include/asm/syscall.h +++ b/arch/sparc/include/asm/syscall.h @@ -117,6 +117,16 @@ static inline void syscall_get_arguments(struct task_s= truct *task, } } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + unsigned int i; + + for (i =3D 0; i < 6; i++) + regs->u_regs[UREG_I0 + i] =3D args[i]; +} + static inline int syscall_get_arch(struct task_struct *task) { #if defined(CONFIG_SPARC64) && defined(CONFIG_COMPAT) diff --git a/arch/um/include/asm/syscall-generic.h b/arch/um/include/asm/sy= scall-generic.h index 172b74143c4b..2984feb9d576 100644 --- a/arch/um/include/asm/syscall-generic.h +++ b/arch/um/include/asm/syscall-generic.h @@ -62,6 +62,20 @@ static inline void syscall_get_arguments(struct task_str= uct *task, *args =3D UPT_SYSCALL_ARG6(r); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + struct uml_pt_regs *r =3D ®s->regs; + + UPT_SYSCALL_ARG1(r) =3D *args++; + UPT_SYSCALL_ARG2(r) =3D *args++; + UPT_SYSCALL_ARG3(r) =3D *args++; + UPT_SYSCALL_ARG4(r) =3D *args++; + UPT_SYSCALL_ARG5(r) =3D *args++; + UPT_SYSCALL_ARG6(r) =3D *args; +} + /* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */ =20 #endif /* __UM_SYSCALL_GENERIC_H */ diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index 7c488ff0c764..b9c249dd9e3d 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -90,6 +90,18 @@ static inline void syscall_get_arguments(struct task_str= uct *task, args[5] =3D regs->bp; } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + regs->bx =3D args[0]; + regs->cx =3D args[1]; + regs->dx =3D args[2]; + regs->si =3D args[3]; + regs->di =3D args[4]; + regs->bp =3D args[5]; +} + static inline int syscall_get_arch(struct task_struct *task) { return AUDIT_ARCH_I386; @@ -121,6 +133,30 @@ static inline void syscall_get_arguments(struct task_s= truct *task, } } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ +# ifdef CONFIG_IA32_EMULATION + if (task->thread_info.status & TS_COMPAT) { + regs->bx =3D *args++; + regs->cx =3D *args++; + regs->dx =3D *args++; + regs->si =3D *args++; + regs->di =3D *args++; + regs->bp =3D *args; + } else +# endif + { + regs->di =3D *args++; + regs->si =3D *args++; + regs->dx =3D *args++; + regs->r10 =3D *args++; + regs->r8 =3D *args++; + regs->r9 =3D *args; + } +} + static inline int syscall_get_arch(struct task_struct *task) { /* x32 tasks should be considered AUDIT_ARCH_X86_64. */ diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/sy= scall.h index 5ee974bf8330..f9a671cbf933 100644 --- a/arch/xtensa/include/asm/syscall.h +++ b/arch/xtensa/include/asm/syscall.h @@ -68,6 +68,17 @@ static inline void syscall_get_arguments(struct task_str= uct *task, args[i] =3D regs->areg[reg[i]]; } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + static const unsigned int reg[] =3D XTENSA_SYSCALL_ARGUMENT_REGS; + unsigned int i; + + for (i =3D 0; i < 6; ++i) + regs->areg[reg[i]] =3D args[i]; +} + asmlinkage long xtensa_rt_sigreturn(void); asmlinkage long xtensa_shmat(int, char __user *, int); asmlinkage long xtensa_fadvise64_64(int, int, diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h index 5a80fe728dc8..0f7b9a493de7 100644 --- a/include/asm-generic/syscall.h +++ b/include/asm-generic/syscall.h @@ -117,6 +117,22 @@ void syscall_set_return_value(struct task_struct *task= , struct pt_regs *regs, void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, unsigned long *args); =20 +/** + * syscall_set_arguments - change system call parameter value + * @task: task of interest, must be in system call entry tracing + * @regs: task_pt_regs() of @task + * @args: array of argument values to store + * + * Changes 6 arguments to the system call. + * The first argument gets value @args[0], and so on. + * + * It's only valid to call this when @task is stopped for tracing on + * entry to a system call, due to %SYSCALL_WORK_SYSCALL_TRACE or + * %SYSCALL_WORK_SYSCALL_AUDIT. + */ +void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, + const unsigned long *args); + /** * syscall_get_arch - return the AUDIT_ARCH for the current system call * @task: task of interest, must be blocked --=20 ldv From nobody Sat Feb 7 15:09:45 2026 Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0BA931E1A2B; Tue, 7 Jan 2025 23:04:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291063; cv=none; b=AOy/+XHjYb3p/ezh9PDOCj2BbHLJ5wciecP6IUv14iSgEgD5ZL18Ckvba5GmI8HSlxJSxgTQWXB/CKAf5DrOthRS155yyzDT2enoH6o+cK46dpz2cyIyRF3RDqqM+pAo9N0KH0CAVzXeBgfj87/tcH8394FZJL/0EujZTgsNEGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291063; c=relaxed/simple; bh=KgQKMSoLYgQrqOpHNSWMl9ct3UhB8JjvzQewc52LNWQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=h1FxxfbQySq4mIN5vrd4e4LW8RY4lY9FS56pKkK3chHj4M/t8gIisj+HKG5B8mI3NPWyhj5z+Zk3f0T2nuZwssdGFPJ+1ibiKT+20XKQ+DX4OzIO5niEFVhhtD/9AV1eEVCXHVsR2JZamvTq/jyc9HlRCAr9ifsz4/BvA8m6NSw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 2B68172C90B; Wed, 8 Jan 2025 02:04:19 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 037907CCB3A; Wed, 8 Jan 2025 01:04:18 +0200 (IST) Date: Wed, 8 Jan 2025 01:04:18 +0200 From: "Dmitry V. Levin" To: Oleg Nesterov Cc: Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, Vineet Gupta , Russell King , Catalin Marinas , Will Deacon , Guo Ren , Brian Cain , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH 2/6] syscall.h: add syscall_set_arguments() on remaining HAVE_ARCH_TRACEHOOK arches Message-ID: <20250107230418.GB30633@strace.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250107230153.GA30560@strace.io> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add syscall_set_arguments() on those few HAVE_ARCH_TRACEHOOK architectures that haven't provided it yet. syscall_set_arguments() is going to be needed on all HAVE_ARCH_TRACEHOOK architectures to implement PTRACE_SET_SYSCALL_INFO API. Signed-off-by: Dmitry V. Levin --- arch/arc/include/asm/syscall.h | 14 +++++++++ arch/arm/include/asm/syscall.h | 13 ++++++++ arch/arm64/include/asm/syscall.h | 13 ++++++++ arch/csky/include/asm/syscall.h | 13 ++++++++ arch/hexagon/include/asm/syscall.h | 7 +++++ arch/loongarch/include/asm/syscall.h | 8 +++++ arch/mips/include/asm/syscall.h | 46 ++++++++++++++++++++++++++++ arch/parisc/include/asm/syscall.h | 12 ++++++++ 8 files changed, 126 insertions(+) diff --git a/arch/arc/include/asm/syscall.h b/arch/arc/include/asm/syscall.h index 9709256e31c8..89c1e1736356 100644 --- a/arch/arc/include/asm/syscall.h +++ b/arch/arc/include/asm/syscall.h @@ -67,6 +67,20 @@ syscall_get_arguments(struct task_struct *task, struct p= t_regs *regs, } } =20 +static inline void +syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, + unsigned long *args) +{ + unsigned long *inside_ptregs =3D ®s->r0; + unsigned int n =3D 6; + unsigned int i =3D 0; + + while (n--) { + *inside_ptregs =3D args[i++]; + inside_ptregs--; + } +} + static inline int syscall_get_arch(struct task_struct *task) { diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index fe4326d938c1..21927fa0ae2b 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -80,6 +80,19 @@ static inline void syscall_get_arguments(struct task_str= uct *task, memcpy(args, ®s->ARM_r0 + 1, 5 * sizeof(args[0])); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + memcpy(®s->ARM_r0, args, 6 * sizeof(args[0])); + /* + * Also copy the first argument into ARM_ORIG_r0 + * so that syscall_get_arguments() would return it + * instead of the previous value. + */ + regs->ARM_ORIG_r0 =3D regs->ARM_r0; +} + static inline int syscall_get_arch(struct task_struct *task) { /* ARM tasks don't change audit architectures on the fly. */ diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/sysc= all.h index ab8e14b96f68..76020b66286b 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -73,6 +73,19 @@ static inline void syscall_get_arguments(struct task_str= uct *task, memcpy(args, ®s->regs[1], 5 * sizeof(args[0])); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + const unsigned long *args) +{ + memcpy(®s->regs[0], args, 6 * sizeof(args[0])); + /* + * Also copy the first argument into orig_x0 + * so that syscall_get_arguments() would return it + * instead of the previous value. + */ + regs->orig_x0 =3D regs->regs[0]; +} + /* * We don't care about endianness (__AUDIT_ARCH_LE bit) here because * AArch64 has the same system calls both on little- and big- endian. diff --git a/arch/csky/include/asm/syscall.h b/arch/csky/include/asm/syscal= l.h index 0de5734950bf..30403f7a0487 100644 --- a/arch/csky/include/asm/syscall.h +++ b/arch/csky/include/asm/syscall.h @@ -59,6 +59,19 @@ syscall_get_arguments(struct task_struct *task, struct p= t_regs *regs, memcpy(args, ®s->a1, 5 * sizeof(args[0])); } =20 +static inline void +syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, + const unsigned long *args) +{ + memcpy(®s->a0, args, 6 * sizeof(regs->a0)); + /* + * Also copy the first argument into orig_x0 + * so that syscall_get_arguments() would return it + * instead of the previous value. + */ + regs->orig_a0 =3D regs->a0; +} + static inline int syscall_get_arch(struct task_struct *task) { diff --git a/arch/hexagon/include/asm/syscall.h b/arch/hexagon/include/asm/= syscall.h index f6e454f18038..12d2df6aaa03 100644 --- a/arch/hexagon/include/asm/syscall.h +++ b/arch/hexagon/include/asm/syscall.h @@ -33,6 +33,13 @@ static inline void syscall_get_arguments(struct task_str= uct *task, memcpy(args, &(®s->r00)[0], 6 * sizeof(args[0])); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned long *args) +{ + memcpy(&(®s->r00)[0], args, 6 * sizeof(args[0])); +} + static inline long syscall_get_error(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/loongarch/include/asm/syscall.h b/arch/loongarch/include/= asm/syscall.h index e286dc58476e..ff415b3c0a8e 100644 --- a/arch/loongarch/include/asm/syscall.h +++ b/arch/loongarch/include/asm/syscall.h @@ -61,6 +61,14 @@ static inline void syscall_get_arguments(struct task_str= uct *task, memcpy(&args[1], ®s->regs[5], 5 * sizeof(long)); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned long *args) +{ + regs->orig_a0 =3D args[0]; + memcpy(®s->regs[5], &args[1], 5 * sizeof(long)); +} + static inline int syscall_get_arch(struct task_struct *task) { return AUDIT_ARCH_LOONGARCH64; diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscal= l.h index ebdf4d910af2..b8a19e465bf4 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -90,6 +90,37 @@ static inline void mips_get_syscall_arg(unsigned long *a= rg, unreachable(); } =20 +static inline void mips_set_syscall_arg(unsigned long *arg, + struct task_struct *task, struct pt_regs *regs, unsigned int n) +{ + unsigned long usp __maybe_unused =3D regs->regs[29]; + + switch (n) { + case 0: case 1: case 2: case 3: + regs->regs[4 + n] =3D *arg; + + return; + +#ifdef CONFIG_32BIT + case 4: case 5: case 6: case 7: + put_user(*arg, (int *)usp + n); + return; +#endif + +#ifdef CONFIG_64BIT + case 4: case 5: case 6: case 7: +#ifdef CONFIG_MIPS32_O32 + if (test_tsk_thread_flag(task, TIF_32BIT_REGS)) + put_user(*arg, (int *)usp + n); + else +#endif + regs->regs[4 + n] =3D *arg; + + return; +#endif + } +} + static inline long syscall_get_error(struct task_struct *task, struct pt_regs *regs) { @@ -136,6 +167,21 @@ static inline void syscall_get_arguments(struct task_s= truct *task, mips_get_syscall_arg(args++, task, regs, i++); } =20 +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned long *args) +{ + unsigned int i =3D 0; + unsigned int n =3D 6; + + /* O32 ABI syscall() */ + if (mips_syscall_is_indirect(task, regs)) + i++; + + while (n--) + mips_set_syscall_arg(args++, task, regs, i++); +} + extern const unsigned long sys_call_table[]; extern const unsigned long sys32_call_table[]; extern const unsigned long sysn32_call_table[]; diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/sy= scall.h index 00b127a5e09b..b146d0ae4c77 100644 --- a/arch/parisc/include/asm/syscall.h +++ b/arch/parisc/include/asm/syscall.h @@ -29,6 +29,18 @@ static inline void syscall_get_arguments(struct task_str= uct *tsk, args[0] =3D regs->gr[26]; } =20 +static inline void syscall_set_arguments(struct task_struct *tsk, + struct pt_regs *regs, + unsigned long *args) +{ + regs->gr[21] =3D args[5]; + regs->gr[22] =3D args[4]; + regs->gr[23] =3D args[3]; + regs->gr[24] =3D args[2]; + regs->gr[25] =3D args[1]; + regs->gr[26] =3D args[0]; +} + static inline long syscall_get_error(struct task_struct *task, struct pt_regs *regs) { --=20 ldv From nobody Sat Feb 7 15:09:45 2026 Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 694241DD539; Tue, 7 Jan 2025 23:04:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291081; cv=none; b=i8fz33IiPf+/xNpA96RH+pI+Brh7XXZ8oO+06Zz6i88hNBgKyerYXQAkTH6GGOl3rJvIObcu4pwxK/85zRs39ghb+YBVBLHGCFJOnTlFns77aDeIcLKfa5K+H+K/eVkuHCcl1sYHG5fzUuZNRvlYOF8wHErWOAtifIah0oMk2dI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291081; c=relaxed/simple; bh=o5H2I+WdlsslDx3hcwUZJXmkkoZ/6gjhFeIPdJxpwpY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=uAs+ehuL7aQk30nccnOTWxMUqXfZVYkrQ1PuRY1VCEbbXbx9PlUgATt5e/TcNN0y47P+5cCOdI/GKW9XMYm+N3pqBZOLmG9ybZCH8jM7reogZqfm3xK8odsH8ZN7Xedy7hzRkr/+FvNPZXitIl/KggRfywNqwFziN/1R3Be2tWE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id A0D0972C97D; Wed, 8 Jan 2025 02:04:38 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 734627CCB3A; Wed, 8 Jan 2025 01:04:38 +0200 (IST) Date: Wed, 8 Jan 2025 01:04:38 +0200 From: "Dmitry V. Levin" To: Oleg Nesterov Cc: Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, Vineet Gupta , Russell King , Catalin Marinas , Will Deacon , Brian Cain , Huacai Chen , WANG Xuerui , Geert Uytterhoeven , Michal Simek , Thomas Bogendoerfer , Dinh Nguyen , Jonas Bonn , Stefan Kristiansson , Stafford Horne , "James E.J. Bottomley" , Helge Deller , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Andreas Larsson , Richard Weinberger , Anton Ivanov , Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Chris Zankel , Max Filippov , Arnd Bergmann , linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org Subject: [PATCH 3/6] syscall.h: introduce syscall_set_nr() Message-ID: <20250107230438.GC30633@strace.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250107230153.GA30560@strace.io> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to syscall_set_arguments() that complements syscall_get_arguments(), introduce syscall_set_nr() that complements syscall_get_nr(). syscall_set_nr() is going to be needed along with syscall_set_arguments() on all HAVE_ARCH_TRACEHOOK architectures to implement PTRACE_SET_SYSCALL_INFO API. Signed-off-by: Dmitry V. Levin --- arch/arc/include/asm/syscall.h | 6 ++++++ arch/arm/include/asm/syscall.h | 12 ++++++++++++ arch/arm64/include/asm/syscall.h | 7 +++++++ arch/hexagon/include/asm/syscall.h | 7 +++++++ arch/loongarch/include/asm/syscall.h | 7 +++++++ arch/m68k/include/asm/syscall.h | 7 +++++++ arch/microblaze/include/asm/syscall.h | 7 +++++++ arch/mips/include/asm/syscall.h | 7 +++++++ arch/nios2/include/asm/syscall.h | 5 +++++ arch/openrisc/include/asm/syscall.h | 6 ++++++ arch/parisc/include/asm/syscall.h | 7 +++++++ arch/powerpc/include/asm/syscall.h | 5 +++++ arch/riscv/include/asm/syscall.h | 7 +++++++ arch/s390/include/asm/syscall.h | 7 +++++++ arch/sh/include/asm/syscall_32.h | 7 +++++++ arch/sparc/include/asm/syscall.h | 7 +++++++ arch/um/include/asm/syscall-generic.h | 5 +++++ arch/x86/include/asm/syscall.h | 7 +++++++ arch/xtensa/include/asm/syscall.h | 7 +++++++ include/asm-generic/syscall.h | 14 ++++++++++++++ 20 files changed, 144 insertions(+) diff --git a/arch/arc/include/asm/syscall.h b/arch/arc/include/asm/syscall.h index 89c1e1736356..6095fbfa74ab 100644 --- a/arch/arc/include/asm/syscall.h +++ b/arch/arc/include/asm/syscall.h @@ -23,6 +23,12 @@ syscall_get_nr(struct task_struct *task, struct pt_regs = *regs) return -1; } =20 +static inline void +syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr) +{ + regs->r8 =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h index 21927fa0ae2b..cfa61f355675 100644 --- a/arch/arm/include/asm/syscall.h +++ b/arch/arm/include/asm/syscall.h @@ -31,6 +31,18 @@ static inline int syscall_get_nr(struct task_struct *tas= k, return task_thread_info(task)->abi_syscall & __NR_SYSCALL_MASK; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + if (!IS_ENABLED(CONFIG_AEABI) || IS_ENABLED(CONFIG_OABI_COMPAT)) { + if (nr !=3D -1) + nr &=3D __NR_SYSCALL_MASK; + } + + task_thread_info(task)->abi_syscall =3D nr; +} + static inline bool __in_oabi_syscall(struct task_struct *task) { return IS_ENABLED(CONFIG_OABI_COMPAT) && diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/sysc= all.h index 76020b66286b..0e6807618bed 100644 --- a/arch/arm64/include/asm/syscall.h +++ b/arch/arm64/include/asm/syscall.h @@ -23,6 +23,13 @@ static inline int syscall_get_nr(struct task_struct *tas= k, return regs->syscallno; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->syscallno =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/hexagon/include/asm/syscall.h b/arch/hexagon/include/asm/= syscall.h index 12d2df6aaa03..72befa719434 100644 --- a/arch/hexagon/include/asm/syscall.h +++ b/arch/hexagon/include/asm/syscall.h @@ -26,6 +26,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return regs->r06; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->r06 =3D nr; +} + static inline void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, unsigned long *args) diff --git a/arch/loongarch/include/asm/syscall.h b/arch/loongarch/include/= asm/syscall.h index ff415b3c0a8e..81d2733f7b94 100644 --- a/arch/loongarch/include/asm/syscall.h +++ b/arch/loongarch/include/asm/syscall.h @@ -26,6 +26,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return regs->regs[11]; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->regs[11] =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/m68k/include/asm/syscall.h b/arch/m68k/include/asm/syscal= l.h index d1453e850cdd..bf84b160c2eb 100644 --- a/arch/m68k/include/asm/syscall.h +++ b/arch/m68k/include/asm/syscall.h @@ -14,6 +14,13 @@ static inline int syscall_get_nr(struct task_struct *tas= k, return regs->orig_d0; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->orig_d0 =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/microblaze/include/asm/syscall.h b/arch/microblaze/includ= e/asm/syscall.h index 5eb3f624cc59..b5b6b91fae3e 100644 --- a/arch/microblaze/include/asm/syscall.h +++ b/arch/microblaze/include/asm/syscall.h @@ -14,6 +14,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return regs->r12; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->r12 =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscal= l.h index b8a19e465bf4..793026c4c7f0 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -41,6 +41,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return task_thread_info(task)->syscall; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + task_thread_info(task)->syscall =3D nr; +} + static inline void mips_syscall_update_nr(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/nios2/include/asm/syscall.h b/arch/nios2/include/asm/sysc= all.h index 526449edd768..8e3eb1d689bb 100644 --- a/arch/nios2/include/asm/syscall.h +++ b/arch/nios2/include/asm/syscall.h @@ -15,6 +15,11 @@ static inline int syscall_get_nr(struct task_struct *tas= k, struct pt_regs *regs) return regs->r2; } =20 +static inline void syscall_set_nr(struct task_struct *task, struct pt_regs= *regs, int nr) +{ + regs->r2 =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/as= m/syscall.h index e6383be2a195..5e037d9659c5 100644 --- a/arch/openrisc/include/asm/syscall.h +++ b/arch/openrisc/include/asm/syscall.h @@ -25,6 +25,12 @@ syscall_get_nr(struct task_struct *task, struct pt_regs = *regs) return regs->orig_gpr11; } =20 +static inline void +syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr) +{ + regs->orig_gpr11 =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/sy= scall.h index b146d0ae4c77..c11222798ab2 100644 --- a/arch/parisc/include/asm/syscall.h +++ b/arch/parisc/include/asm/syscall.h @@ -17,6 +17,13 @@ static inline long syscall_get_nr(struct task_struct *ts= k, return regs->gr[20]; } =20 +static inline void syscall_set_nr(struct task_struct *tsk, + struct pt_regs *regs, + int nr) +{ + regs->gr[20] =3D nr; +} + static inline void syscall_get_arguments(struct task_struct *tsk, struct pt_regs *regs, unsigned long *args) diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/= syscall.h index b2715448a660..09e34d19c961 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h @@ -39,6 +39,11 @@ static inline int syscall_get_nr(struct task_struct *tas= k, struct pt_regs *regs) return -1; } =20 +static inline void syscall_set_nr(struct task_struct *task, struct pt_regs= *regs, int nr) +{ + regs->gpr[0] =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/sysc= all.h index 8d389ba995c8..a5281cdf2b10 100644 --- a/arch/riscv/include/asm/syscall.h +++ b/arch/riscv/include/asm/syscall.h @@ -30,6 +30,13 @@ static inline int syscall_get_nr(struct task_struct *tas= k, return regs->a7; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->a7 =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscal= l.h index b3dd883699e7..1c0e349fd5c9 100644 --- a/arch/s390/include/asm/syscall.h +++ b/arch/s390/include/asm/syscall.h @@ -24,6 +24,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, (regs->int_code & 0xffff) : -1; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->int_code =3D (regs->int_code & ~0xffff) | (nr & 0xffff); +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall= _32.h index cb51a7528384..0e1e7b029457 100644 --- a/arch/sh/include/asm/syscall_32.h +++ b/arch/sh/include/asm/syscall_32.h @@ -15,6 +15,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return (regs->tra >=3D 0) ? regs->regs[3] : -1L; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->regs[3] =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/sysc= all.h index 62a5a78804c4..36830a37fda4 100644 --- a/arch/sparc/include/asm/syscall.h +++ b/arch/sparc/include/asm/syscall.h @@ -25,6 +25,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return (syscall_p ? regs->u_regs[UREG_G1] : -1L); } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->u_regs[UREG_G1] =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/um/include/asm/syscall-generic.h b/arch/um/include/asm/sy= scall-generic.h index 2984feb9d576..bcd73bcfe577 100644 --- a/arch/um/include/asm/syscall-generic.h +++ b/arch/um/include/asm/syscall-generic.h @@ -21,6 +21,11 @@ static inline int syscall_get_nr(struct task_struct *tas= k, struct pt_regs *regs) return PT_REGS_SYSCALL_NR(regs); } =20 +static inline void syscall_set_nr(struct task_struct *task, struct pt_regs= *regs, int nr) +{ + PT_REGS_SYSCALL_NR(regs) =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index b9c249dd9e3d..c10dbb74cd00 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -38,6 +38,13 @@ static inline int syscall_get_nr(struct task_struct *tas= k, struct pt_regs *regs) return regs->orig_ax; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->orig_ax =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/sy= scall.h index f9a671cbf933..7db3b489c8ad 100644 --- a/arch/xtensa/include/asm/syscall.h +++ b/arch/xtensa/include/asm/syscall.h @@ -28,6 +28,13 @@ static inline long syscall_get_nr(struct task_struct *ta= sk, return regs->syscall; } =20 +static inline void syscall_set_nr(struct task_struct *task, + struct pt_regs *regs, + int nr) +{ + regs->syscall =3D nr; +} + static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h index 0f7b9a493de7..e33fd4e783c1 100644 --- a/include/asm-generic/syscall.h +++ b/include/asm-generic/syscall.h @@ -37,6 +37,20 @@ struct pt_regs; */ int syscall_get_nr(struct task_struct *task, struct pt_regs *regs); =20 +/** + * syscall_set_nr - change the system call a task is executing + * @task: task of interest, must be blocked + * @regs: task_pt_regs() of @task + * @nr: system call number + * + * Changes the system call number @task is about to execute. + * + * It's only valid to call this when @task is stopped for tracing on + * entry to a system call, due to %SYSCALL_WORK_SYSCALL_TRACE or + * %SYSCALL_WORK_SYSCALL_AUDIT. + */ +void syscall_set_nr(struct task_struct *task, struct pt_regs *regs, int nr= ); + /** * syscall_rollback - roll back registers after an aborted system call * @task: task of interest, must be in system call exit tracing --=20 ldv From nobody Sat Feb 7 15:09:45 2026 Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0DC5E1F6666 for ; Tue, 7 Jan 2025 23:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291089; cv=none; b=olUaLKHGHAHWK8NGlG9BkARfF6g7dYgA1kM8d+lgt6T4AFUM/74xqSPf5oI3WwVNC4KrlUdfjJiA504plZXu0sYdxOutTqoJKysv3/0zGQg26MDYSYX1gqCgPM96L4ZqOzMS5n662TvSK0QI8BylTC73dzWtLoMv0HBOF4h4rxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291089; c=relaxed/simple; bh=jbWjQs7WFDFLX5S67TEhVGEaXXHOyDQMVLMCMhuP3aE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=sJ9q9e0cLdMxzO1VxlNI3sqCPHYJ8zoNb3nhvbZtC7vlYG+FcpJ6KNmJexfcUEbxSZlb1WpuEF4WFLYLvhE29CIzepntQcaPYu9nd5Yr0ipEi4Phq4H+KJYQK2SXWZ9t3jRMNWLKcuNHi+Ll3hvc6XvuLY0CfQbiN4doCaeqDCg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 3343B72C97D; Wed, 8 Jan 2025 02:04:47 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 286C57CCB3A; Wed, 8 Jan 2025 01:04:47 +0200 (IST) Date: Wed, 8 Jan 2025 01:04:47 +0200 From: "Dmitry V. Levin" To: Oleg Nesterov Cc: Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] ptrace_get_syscall_info: factor out ptrace_get_syscall_info_op Message-ID: <20250107230446.GD30633@strace.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250107230153.GA30560@strace.io> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the code that calculates the type of the system call stop out of ptrace_get_syscall_info() into a separate function ptrace_get_syscall_info_op() which is going to be used later to implement PTRACE_SET_SYSCALL_INFO API. Signed-off-by: Dmitry V. Levin --- kernel/ptrace.c | 52 ++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/kernel/ptrace.c b/kernel/ptrace.c index d5f89f9ef29f..e7e0003cc8e0 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -965,19 +965,8 @@ ptrace_get_syscall_info_exit(struct task_struct *child= , struct pt_regs *regs, } =20 static int -ptrace_get_syscall_info(struct task_struct *child, unsigned long user_size, - void __user *datavp) +ptrace_get_syscall_info_op(struct task_struct *child) { - struct pt_regs *regs =3D task_pt_regs(child); - struct ptrace_syscall_info info =3D { - .op =3D PTRACE_SYSCALL_INFO_NONE, - .arch =3D syscall_get_arch(child), - .instruction_pointer =3D instruction_pointer(regs), - .stack_pointer =3D user_stack_pointer(regs), - }; - unsigned long actual_size =3D offsetof(struct ptrace_syscall_info, entry); - unsigned long write_size; - /* * This does not need lock_task_sighand() to access * child->last_siginfo because ptrace_freeze_traced() @@ -988,18 +977,41 @@ ptrace_get_syscall_info(struct task_struct *child, un= signed long user_size, case SIGTRAP | 0x80: switch (child->ptrace_message) { case PTRACE_EVENTMSG_SYSCALL_ENTRY: - actual_size =3D ptrace_get_syscall_info_entry(child, regs, - &info); - break; + return PTRACE_SYSCALL_INFO_ENTRY; case PTRACE_EVENTMSG_SYSCALL_EXIT: - actual_size =3D ptrace_get_syscall_info_exit(child, regs, - &info); - break; + return PTRACE_SYSCALL_INFO_EXIT; } break; case SIGTRAP | (PTRACE_EVENT_SECCOMP << 8): - actual_size =3D ptrace_get_syscall_info_seccomp(child, regs, - &info); + return PTRACE_SYSCALL_INFO_SECCOMP; + } + + return PTRACE_SYSCALL_INFO_NONE; +} + +static int +ptrace_get_syscall_info(struct task_struct *child, unsigned long user_size, + void __user *datavp) +{ + struct pt_regs *regs =3D task_pt_regs(child); + struct ptrace_syscall_info info =3D { + .op =3D ptrace_get_syscall_info_op(child), + .arch =3D syscall_get_arch(child), + .instruction_pointer =3D instruction_pointer(regs), + .stack_pointer =3D user_stack_pointer(regs), + }; + unsigned long actual_size =3D offsetof(struct ptrace_syscall_info, entry); + unsigned long write_size; + + switch (info.op) { + case PTRACE_SYSCALL_INFO_ENTRY: + actual_size =3D ptrace_get_syscall_info_entry(child, regs, &info); + break; + case PTRACE_SYSCALL_INFO_EXIT: + actual_size =3D ptrace_get_syscall_info_exit(child, regs, &info); + break; + case PTRACE_SYSCALL_INFO_SECCOMP: + actual_size =3D ptrace_get_syscall_info_seccomp(child, regs, &info); break; } =20 --=20 ldv From nobody Sat Feb 7 15:09:45 2026 Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B698B1E105E; Tue, 7 Jan 2025 23:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291099; cv=none; b=hf01U/CPxp0/j15GMFtuhf7PJOiC6n9ugqp0d83QJLUBJOCOC5wFd6pBu+Ia7HwCimhBwHeAe3rZ5mewc2iEIKDC8EAV6GQ/GP5vgaoOlJUfVwTnkcENKcDrQleIrRM5A6f42DK6ejOApzlSbk8Y1LxS1yPjPNHLQn4NRRJxhDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291099; c=relaxed/simple; bh=+G3IisoxA6JNZOJ5hIvIm1oaWXo3nppHiQC5QYthmYk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=FZN/GieK93wLj1oQWd9rT72qiluS3L60sP+i3COe3+RaSBLJbv2FIRl0ki7lfgmYyUWLM3fBuEDKVtVRxEL+jfsTEjgGjTcUas/agFjWwNh6vFK7cHfth+oQs6LbQ9XdIcKNOv9NStphmYotyZjeh7kiYY0bqWY/FyT60sBEps8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 90A9972C97D; Wed, 8 Jan 2025 02:04:56 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 7D7417CCB3A; Wed, 8 Jan 2025 01:04:56 +0200 (IST) Date: Wed, 8 Jan 2025 01:04:56 +0200 From: "Dmitry V. Levin" To: Oleg Nesterov Cc: Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH 5/6] ptrace: introduce PTRACE_SET_SYSCALL_INFO request Message-ID: <20250107230456.GE30633@strace.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250107230153.GA30560@strace.io> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" PTRACE_SET_SYSCALL_INFO is a generic ptrace API that complements PTRACE_GET_SYSCALL_INFO by letting the ptracer modify details of system calls the tracee is blocked in. This API allows ptracers to obtain and modify system call details in a straightforward and architecture-agnostic way. Current implementation supports changing only those bits of system call information that are used by strace, namely, syscall number, syscall arguments, and syscall return value. Support of changing additional details returned by PTRACE_GET_SYSCALL_INFO, such as instruction pointer and stack pointer, could be added later if needed, by re-using struct ptrace_syscall_info.reserved to specify the additional details that should be set. Currently, the reserved field of struct ptrace_syscall_info must be initialized with zeroes; arch, instruction_pointer, and stack_pointer fields are ignored. PTRACE_SET_SYSCALL_INFO currently supports only PTRACE_SYSCALL_INFO_ENTRY, PTRACE_SYSCALL_INFO_EXIT, and PTRACE_SYSCALL_INFO_SECCOMP operations. Other operations could be added later if needed. Ideally, PTRACE_SET_SYSCALL_INFO should have been introduced along with PTRACE_GET_SYSCALL_INFO, but it didn't happen. The last straw that convinced me to implement PTRACE_SET_SYSCALL_INFO was apparent failure to provide an API of changing the first system call argument on riscv architecture. ptrace(2) man page: long ptrace(enum __ptrace_request request, pid_t pid, void *addr, void *dat= a); ... PTRACE_SET_SYSCALL_INFO Modify information about the system call that caused the stop. The "data" argument is a pointer to struct ptrace_syscall_info that specifies the system call information to be set. The "addr" argument should be set to sizeof(struct ptrace_syscall_in= fo)). Link: https://lore.kernel.org/all/59505464-c84a-403d-972f-d4b2055eeaac@gmai= l.com/ Signed-off-by: Dmitry V. Levin --- include/linux/ptrace.h | 3 ++ include/uapi/linux/ptrace.h | 3 +- kernel/ptrace.c | 102 ++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 90507d4afcd6..c8dbf1e498bf 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -17,6 +17,9 @@ struct syscall_info { struct seccomp_data data; }; =20 +/* sizeof() the first published struct ptrace_syscall_info */ +#define PTRACE_SYSCALL_INFO_SIZE_VER0 84 + extern int ptrace_access_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, unsigned int gup_flags); =20 diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h index 72c038fc71d0..231b8bf7eeff 100644 --- a/include/uapi/linux/ptrace.h +++ b/include/uapi/linux/ptrace.h @@ -74,6 +74,7 @@ struct seccomp_metadata { }; =20 #define PTRACE_GET_SYSCALL_INFO 0x420e +#define PTRACE_SET_SYSCALL_INFO 0x4212 #define PTRACE_SYSCALL_INFO_NONE 0 #define PTRACE_SYSCALL_INFO_ENTRY 1 #define PTRACE_SYSCALL_INFO_EXIT 2 @@ -81,7 +82,7 @@ struct seccomp_metadata { =20 struct ptrace_syscall_info { __u8 op; /* PTRACE_SYSCALL_INFO_* */ - __u8 pad[3]; + __u8 reserved[3]; __u32 arch; __u64 instruction_pointer; __u64 stack_pointer; diff --git a/kernel/ptrace.c b/kernel/ptrace.c index e7e0003cc8e0..52377653743d 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -1018,6 +1018,104 @@ ptrace_get_syscall_info(struct task_struct *child, = unsigned long user_size, write_size =3D min(actual_size, user_size); return copy_to_user(datavp, &info, write_size) ? -EFAULT : actual_size; } + +static unsigned long +ptrace_set_syscall_info_entry(struct task_struct *child, struct pt_regs *r= egs, + struct ptrace_syscall_info *info) +{ + unsigned long args[ARRAY_SIZE(info->entry.args)]; + int nr =3D info->entry.nr; + int i; + + if (nr !=3D info->entry.nr) + return -ERANGE; + + for (i =3D 0; i < ARRAY_SIZE(args); i++) { + args[i] =3D info->entry.args[i]; + if (args[i] !=3D info->entry.args[i]) + return -ERANGE; + } + + syscall_set_nr(child, regs, nr); + syscall_set_arguments(child, regs, args); + if (nr =3D=3D -1) { + /* + * When the syscall number is set to -1, the syscall will be + * skipped. In this case also set the syscall return value to + * -ENOSYS, otherwise on some architectures the corresponding + * struct pt_regs field will remain unchanged. + * + * Note that on some architectures syscall_set_return_value() + * modifies one of the struct pt_regs fields also modified by + * syscall_set_arguments(), so the former should be called + * after the latter. + */ + syscall_set_return_value(child, regs, -ENOSYS, 0); + } + + return 0; +} + +static unsigned long +ptrace_set_syscall_info_seccomp(struct task_struct *child, struct pt_regs = *regs, + struct ptrace_syscall_info *info) +{ + /* + * info->entry is currently a subset of info->seccomp, + * info->seccomp.ret_data is currently ignored. + */ + return ptrace_set_syscall_info_entry(child, regs, info); +} + +static unsigned long +ptrace_set_syscall_info_exit(struct task_struct *child, struct pt_regs *re= gs, + struct ptrace_syscall_info *info) +{ + if (info->exit.is_error) + syscall_set_return_value(child, regs, info->exit.rval, 0); + else + syscall_set_return_value(child, regs, 0, info->exit.rval); + + return 0; +} + +static int +ptrace_set_syscall_info(struct task_struct *child, unsigned long user_size, + void __user *datavp) +{ + struct pt_regs *regs =3D task_pt_regs(child); + struct ptrace_syscall_info info; + int error; + + BUILD_BUG_ON(sizeof(struct ptrace_syscall_info) < PTRACE_SYSCALL_INFO_SIZ= E_VER0); + + if (user_size < PTRACE_SYSCALL_INFO_SIZE_VER0 || user_size > PAGE_SIZE) + return -EINVAL; + + error =3D copy_struct_from_user(&info, sizeof(info), datavp, user_size); + if (error) + return error; + + /* Reserved for future use. */ + if (memchr_inv(info.reserved, 0, sizeof(info.reserved))) + return -EINVAL; + + /* Changing the type of the system call stop is not supported. */ + if (ptrace_get_syscall_info_op(child) !=3D info.op) + return -EINVAL; + + switch (info.op) { + case PTRACE_SYSCALL_INFO_ENTRY: + return ptrace_set_syscall_info_entry(child, regs, &info); + case PTRACE_SYSCALL_INFO_EXIT: + return ptrace_set_syscall_info_exit(child, regs, &info); + case PTRACE_SYSCALL_INFO_SECCOMP: + return ptrace_set_syscall_info_seccomp(child, regs, &info); + default: + /* Other types of system call stops are not supported. */ + return -EINVAL; + } +} #endif /* CONFIG_HAVE_ARCH_TRACEHOOK */ =20 int ptrace_request(struct task_struct *child, long request, @@ -1236,6 +1334,10 @@ int ptrace_request(struct task_struct *child, long r= equest, case PTRACE_GET_SYSCALL_INFO: ret =3D ptrace_get_syscall_info(child, addr, datavp); break; + + case PTRACE_SET_SYSCALL_INFO: + ret =3D ptrace_set_syscall_info(child, addr, datavp); + break; #endif =20 case PTRACE_SECCOMP_GET_FILTER: --=20 ldv From nobody Sat Feb 7 15:09:45 2026 Received: from vmicros1.altlinux.org (vmicros1.altlinux.org [194.107.17.57]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 939FA1F37B4; Tue, 7 Jan 2025 23:05:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.57 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291106; cv=none; b=u+ISt+CaAoNHJR9ymdUmKqyqbHhEthJaMvBGPZmB4bHgPHIvF4W2qp/taOe7/ohtt/0DOFhNRFRODGwMSkrKMPYfBHACb7RjEpKm1Wci+AdWpthBdNlvjBuJ6g0etuoCdRwpXUguw1Sq0pjLPtsdRhXF74c3f65FgnTBwX2lBk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736291106; c=relaxed/simple; bh=TXRAXR8E29lImjMDnEAUaxdDSATZNMoqBSz6buKT2gA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=LP4k8Ro24ZzZG9VamVWmEi/iUqrN4Brb2jSzzx+Mq8dECI9F3ErIKOSAdtqCPmP060GjGzvE4eLVvIAmFvRn2D9gxhd1IILV6T3u94YlP41CiK/RR+pXoYWL61PedxCaZSums34XGAHAcptgjMaQ9Y9LttLnI7cC9S13g4thv+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strace.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id C111972C97E; Wed, 8 Jan 2025 02:05:02 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 93CFD7CCB3A; Wed, 8 Jan 2025 01:05:02 +0200 (IST) Date: Wed, 8 Jan 2025 01:05:02 +0200 From: "Dmitry V. Levin" To: Oleg Nesterov , Shuah Khan Cc: Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 6/6] selftests/ptrace: add a test case for PTRACE_SET_SYSCALL_INFO Message-ID: <20250107230502.GF30633@strace.io> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250107230153.GA30560@strace.io> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check whether PTRACE_SET_SYSCALL_INFO semantics implemented in the kernel matches userspace expectations. Signed-off-by: Dmitry V. Levin --- tools/testing/selftests/ptrace/Makefile | 2 +- .../selftests/ptrace/set_syscall_info.c | 436 ++++++++++++++++++ 2 files changed, 437 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/ptrace/set_syscall_info.c diff --git a/tools/testing/selftests/ptrace/Makefile b/tools/testing/selfte= sts/ptrace/Makefile index 1c631740a730..c5e0b76ba6ac 100644 --- a/tools/testing/selftests/ptrace/Makefile +++ b/tools/testing/selftests/ptrace/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only CFLAGS +=3D -std=3Dc99 -pthread -Wall $(KHDR_INCLUDES) =20 -TEST_GEN_PROGS :=3D get_syscall_info peeksiginfo vmaccess get_set_sud +TEST_GEN_PROGS :=3D get_syscall_info set_syscall_info peeksiginfo vmaccess= get_set_sud =20 include ../lib.mk diff --git a/tools/testing/selftests/ptrace/set_syscall_info.c b/tools/test= ing/selftests/ptrace/set_syscall_info.c new file mode 100644 index 000000000000..f43294e1248e --- /dev/null +++ b/tools/testing/selftests/ptrace/set_syscall_info.c @@ -0,0 +1,436 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018-2025 Dmitry V. Levin + * All rights reserved. + * + * Check whether PTRACE_SET_SYSCALL_INFO semantics implemented in the kern= el + * matches userspace expectations. + */ + +#include "../kselftest_harness.h" +#include +#include +#include +#include +#include "linux/ptrace.h" + +static int +kill_tracee(pid_t pid) +{ + if (!pid) + return 0; + + int saved_errno =3D errno; + + int rc =3D kill(pid, SIGKILL); + + errno =3D saved_errno; + return rc; +} + +static long +sys_ptrace(int request, pid_t pid, unsigned long addr, unsigned long data) +{ + return syscall(__NR_ptrace, request, pid, addr, data); +} + +#define LOG_KILL_TRACEE(fmt, ...) \ + do { \ + kill_tracee(pid); \ + TH_LOG("wait #%d: " fmt, \ + ptrace_stop, ##__VA_ARGS__); \ + } while (0) + +struct si_entry { + int nr; + unsigned long args[6]; +}; +struct si_exit { + unsigned int is_error; + int rval; +}; + +TEST(set_syscall_info) +{ + const pid_t tracer_pid =3D getpid(); + const unsigned long dummy[] =3D { + 0xbad0fed0, + 0xbad1fed1, + 0xbad2fed2, + 0xbad3fed3, + 0xbad4fed4, + 0xbad5fed5, + }; + int splice_in[2], splice_out[2]; + + ASSERT_EQ(0, pipe(splice_in)); + ASSERT_EQ(0, pipe(splice_out)); + ASSERT_EQ(sizeof(dummy), write(splice_in[1], dummy, sizeof(dummy))); + + const struct { + struct si_entry entry[2]; + struct si_exit exit[2]; + } si[] =3D { + /* change scno, keep non-error rval */ + { + { + { + __NR_gettid, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + __NR_getppid, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 0, tracer_pid }, { 0, tracer_pid } + } + }, + + /* set scno to -1, keep error rval */ + { + { + { + __NR_chdir, + { + (unsigned long) ".", dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + -1, + { + (unsigned long) ".", dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 1, -ENOSYS }, { 1, -ENOSYS } + } + }, + + /* keep scno, change non-error rval */ + { + { + { + __NR_getppid, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + __NR_getppid, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 0, tracer_pid }, { 0, tracer_pid + 1 } + } + }, + + /* change arg1, keep non-error rval */ + { + { + { + __NR_chdir, + { + (unsigned long) "", dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + __NR_chdir, + { + (unsigned long) ".", dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 0, 0 }, { 0, 0 } + } + }, + + /* set scno to -1, change error rval to non-error */ + { + { + { + __NR_gettid, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + -1, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 1, -ENOSYS }, { 0, tracer_pid } + } + }, + + /* change scno, change non-error rval to error */ + { + { + { + __NR_chdir, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + __NR_getppid, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 0, tracer_pid }, { 1, -EISDIR } + } + }, + + /* change scno and all args, change non-error rval */ + { + { + { + __NR_gettid, + { + splice_in[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + __NR_splice, + { + splice_in[0], 0, splice_out[1], 0, + sizeof(dummy), SPLICE_F_NONBLOCK + } + } + }, { + { 0, sizeof(dummy) }, { 0, sizeof(dummy) + 1 } + } + }, + + /* change arg1, no exit stop */ + { + { + { + __NR_exit_group, + { + dummy[0], dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + }, { + __NR_exit_group, + { + 0, dummy[1], dummy[2], + dummy[3], dummy[4], dummy[5] + } + } + }, { + { 0, 0 }, { 0, 0 } + } + }, + }; + + long rc; + unsigned int i; + unsigned int ptrace_stop; + + pid_t pid =3D fork(); + + ASSERT_LE(0, pid) { + TH_LOG("fork: %m"); + } + + if (pid =3D=3D 0) { + /* get the pid before PTRACE_TRACEME */ + pid =3D getpid(); + ASSERT_EQ(0, sys_ptrace(PTRACE_TRACEME, 0, 0, 0)) { + TH_LOG("PTRACE_TRACEME: %m"); + } + ASSERT_EQ(0, kill(pid, SIGSTOP)) { + /* cannot happen */ + TH_LOG("kill SIGSTOP: %m"); + } + for (i =3D 0; i < ARRAY_SIZE(si); ++i) { + rc =3D syscall(si[i].entry[0].nr, + si[i].entry[0].args[0], + si[i].entry[0].args[1], + si[i].entry[0].args[2], + si[i].entry[0].args[3], + si[i].entry[0].args[4], + si[i].entry[0].args[5]); + if (si[i].exit[1].is_error) { + if (rc !=3D -1 || errno !=3D -si[i].exit[1].rval) + break; + } else { + if (rc !=3D si[i].exit[1].rval) + break; + } + } + /* + * Something went wrong, but in this state tracee + * cannot reliably issue syscalls, so just crash. + */ + *(volatile unsigned char *) (unsigned long) i =3D 42; + /* unreachable */ + _exit(i + 1); + } + + for (ptrace_stop =3D 0; ; ++ptrace_stop) { + struct ptrace_syscall_info info =3D { + .op =3D 0xff /* invalid PTRACE_SYSCALL_INFO_* op */ + }; + const size_t size =3D sizeof(info); + const int expected_entry_size =3D + (void *) &info.entry.args[6] - (void *) &info; + const int expected_exit_size =3D + (void *) (&info.exit.is_error + 1) - + (void *) &info; + int status; + + ASSERT_EQ(pid, wait(&status)) { + /* cannot happen */ + LOG_KILL_TRACEE("wait: %m"); + } + if (WIFEXITED(status)) { + pid =3D 0; /* the tracee is no more */ + ASSERT_EQ(0, WEXITSTATUS(status)) { + LOG_KILL_TRACEE("unexpected exit status %u", + WEXITSTATUS(status)); + } + break; + } + ASSERT_FALSE(WIFSIGNALED(status)) { + pid =3D 0; /* the tracee is no more */ + LOG_KILL_TRACEE("unexpected signal %u", + WTERMSIG(status)); + } + ASSERT_TRUE(WIFSTOPPED(status)) { + /* cannot happen */ + LOG_KILL_TRACEE("unexpected wait status %#x", status); + } + + ASSERT_LT(ptrace_stop, ARRAY_SIZE(si) * 2) { + LOG_KILL_TRACEE("ptrace stop overflow"); + } + + switch (WSTOPSIG(status)) { + case SIGSTOP: + ASSERT_EQ(0, ptrace_stop) { + LOG_KILL_TRACEE("unexpected signal stop"); + } + ASSERT_EQ(0, sys_ptrace(PTRACE_SETOPTIONS, pid, 0, + PTRACE_O_TRACESYSGOOD)) { + LOG_KILL_TRACEE("PTRACE_SETOPTIONS: %m"); + } + break; + + case SIGTRAP | 0x80: + ASSERT_LT(0, ptrace_stop) { + LOG_KILL_TRACEE("unexpected syscall stop"); + } + ASSERT_LT(0, (rc =3D sys_ptrace(PTRACE_GET_SYSCALL_INFO, + pid, size, + (unsigned long) &info))) { + LOG_KILL_TRACEE("PTRACE_GET_SYSCALL_INFO: %m"); + } + if (ptrace_stop & 1) { + /* entering syscall */ + const struct si_entry *exp_entry =3D + &si[ptrace_stop / 2].entry[0]; + const struct si_entry *set_entry =3D + &si[ptrace_stop / 2].entry[1]; + + ASSERT_EQ(expected_entry_size, rc) { + LOG_KILL_TRACEE("entry stop mismatch"); + } + ASSERT_EQ(PTRACE_SYSCALL_INFO_ENTRY, info.op) { + LOG_KILL_TRACEE("entry stop mismatch"); + } + ASSERT_TRUE(info.arch) { + LOG_KILL_TRACEE("entry stop mismatch"); + } + ASSERT_TRUE(info.instruction_pointer) { + LOG_KILL_TRACEE("entry stop mismatch"); + } + ASSERT_TRUE(info.stack_pointer) { + LOG_KILL_TRACEE("entry stop mismatch"); + } + ASSERT_EQ(exp_entry->nr, info.entry.nr) { + LOG_KILL_TRACEE("syscall nr mismatch"); + } + for (i =3D 0; i < ARRAY_SIZE(exp_entry->args); ++i) { + ASSERT_EQ(exp_entry->args[i], info.entry.args[i]) { + LOG_KILL_TRACEE("syscall arg #%u mismatch", i); + } + } + info.entry.nr =3D set_entry->nr; + for (i =3D 0; i < ARRAY_SIZE(set_entry->args); ++i) + info.entry.args[i] =3D set_entry->args[i]; + ASSERT_EQ(0, sys_ptrace(PTRACE_SET_SYSCALL_INFO, + pid, size, + (unsigned long) &info)) { + LOG_KILL_TRACEE("PTRACE_SET_SYSCALL_INFO: %m"); + } + } else { + /* exiting syscall */ + const struct si_exit *exp_exit =3D + &si[ptrace_stop / 2 - 1].exit[0]; + const struct si_exit *set_exit =3D + &si[ptrace_stop / 2 - 1].exit[1]; + + ASSERT_EQ(expected_exit_size, rc) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + ASSERT_EQ(PTRACE_SYSCALL_INFO_EXIT, info.op) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + ASSERT_TRUE(info.arch) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + ASSERT_TRUE(info.instruction_pointer) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + ASSERT_TRUE(info.stack_pointer) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + ASSERT_EQ(exp_exit->is_error, info.exit.is_error) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + ASSERT_EQ(exp_exit->rval, info.exit.rval) { + LOG_KILL_TRACEE("exit stop mismatch"); + } + info.exit.is_error =3D set_exit->is_error; + info.exit.rval =3D set_exit->rval; + ASSERT_EQ(0, sys_ptrace(PTRACE_SET_SYSCALL_INFO, + pid, size, + (unsigned long) &info)) { + LOG_KILL_TRACEE("PTRACE_SET_SYSCALL_INFO: %m"); + } + } + break; + + default: + LOG_KILL_TRACEE("unexpected stop signal %u", + WSTOPSIG(status)); + abort(); + } + + ASSERT_EQ(0, sys_ptrace(PTRACE_SYSCALL, pid, 0, 0)) { + LOG_KILL_TRACEE("PTRACE_SYSCALL: %m"); + } + } + + ASSERT_EQ(ptrace_stop, ARRAY_SIZE(si) * 2); +} + +TEST_HARNESS_MAIN --=20 ldv