syscall.h: add syscall_set_arguments()
authorDmitry V. Levin <ldv@strace.io>
Mon, 3 Mar 2025 11:20:09 +0000 (13:20 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 12 May 2025 00:48:15 +0000 (17:48 -0700)
This function is going to be needed on all HAVE_ARCH_TRACEHOOK
architectures to implement PTRACE_SET_SYSCALL_INFO API.

This partially reverts commit 7962c2eddbfe ("arch: remove unused function
syscall_set_arguments()") by reusing some of old syscall_set_arguments()
implementations.

[nathan@kernel.org: fix compile time fortify checks]
Link: https://lkml.kernel.org/r/20250408213131.GA2872426@ax162
Link: https://lkml.kernel.org/r/20250303112009.GC24170@strace.io
Signed-off-by: Dmitry V. Levin <ldv@strace.io>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Charlie Jenkins <charlie@rivosinc.com>
Reviewed-by: Charlie Jenkins <charlie@rivosinc.com>
Acked-by: Helge Deller <deller@gmx.de> # parisc
Reviewed-by: Maciej W. Rozycki <macro@orcam.me.uk> [mips]
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexey Gladkov (Intel) <legion@kernel.org>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: anton ivanov <anton.ivanov@cambridgegreys.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Betkov <bp@alien8.de>
Cc: Brian Cain <bcain@quicinc.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christian Zankel <chris@zankel.net>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Davide Berardi <berardi.dav@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Eugene Syromiatnikov <esyr@redhat.com>
Cc: Eugene Syromyatnikov <evgsyr@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Renzo Davoi <renzo@cs.unibo.it>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russel King <linux@armlinux.org.uk>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Gleinxer <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
19 files changed:
arch/arc/include/asm/syscall.h
arch/arm/include/asm/syscall.h
arch/arm64/include/asm/syscall.h
arch/csky/include/asm/syscall.h
arch/hexagon/include/asm/syscall.h
arch/loongarch/include/asm/syscall.h
arch/mips/include/asm/syscall.h
arch/nios2/include/asm/syscall.h
arch/openrisc/include/asm/syscall.h
arch/parisc/include/asm/syscall.h
arch/powerpc/include/asm/syscall.h
arch/riscv/include/asm/syscall.h
arch/s390/include/asm/syscall.h
arch/sh/include/asm/syscall_32.h
arch/sparc/include/asm/syscall.h
arch/um/include/asm/syscall-generic.h
arch/x86/include/asm/syscall.h
arch/xtensa/include/asm/syscall.h
include/asm-generic/syscall.h

index 9709256e31c8e8f2adce86d1d044ce511130d926..89c1e1736356f41472cc3bca6216446e8c725581 100644 (file)
@@ -67,6 +67,20 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
        }
 }
 
+static inline void
+syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
+                     unsigned long *args)
+{
+       unsigned long *inside_ptregs = &regs->r0;
+       unsigned int n = 6;
+       unsigned int i = 0;
+
+       while (n--) {
+               *inside_ptregs = args[i++];
+               inside_ptregs--;
+       }
+}
+
 static inline int
 syscall_get_arch(struct task_struct *task)
 {
index fe4326d938c18efb54c96930e6b52ab7da9b2942..21927fa0ae2b046af747e003cf73412f11ade6b9 100644 (file)
@@ -80,6 +80,19 @@ static inline void syscall_get_arguments(struct task_struct *task,
        memcpy(args, &regs->ARM_r0 + 1, 5 * sizeof(args[0]));
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       memcpy(&regs->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 = regs->ARM_r0;
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        /* ARM tasks don't change audit architectures on the fly. */
index ab8e14b96f68172e30d7783ad2d98449ffd21c23..76020b66286b8eac12e7c11e92f8f7aa5fd63da2 100644 (file)
@@ -73,6 +73,19 @@ static inline void syscall_get_arguments(struct task_struct *task,
        memcpy(args, &regs->regs[1], 5 * sizeof(args[0]));
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       memcpy(&regs->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 = 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.
index 0de5734950bf91f574fced167bba4629741351da..717f44b4d26f57e24a43be34e6f93c14a10d7684 100644 (file)
@@ -59,6 +59,19 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
        memcpy(args, &regs->a1, 5 * sizeof(args[0]));
 }
 
+static inline void
+syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
+                     const unsigned long *args)
+{
+       memcpy(&regs->a0, args, 6 * sizeof(regs->a0));
+       /*
+        * Also copy the first argument into orig_a0
+        * so that syscall_get_arguments() would return it
+        * instead of the previous value.
+        */
+       regs->orig_a0 = regs->a0;
+}
+
 static inline int
 syscall_get_arch(struct task_struct *task)
 {
index 951ca0ed837626656d055395ec5cbb8fd2db1e7e..1024a6548d78e439fb10b4d7a9e580a9b7ed11b3 100644 (file)
@@ -33,6 +33,13 @@ static inline void syscall_get_arguments(struct task_struct *task,
        memcpy(args, &(&regs->r00)[0], 6 * sizeof(args[0]));
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        unsigned long *args)
+{
+       memcpy(&(&regs->r00)[0], args, 6 * sizeof(args[0]));
+}
+
 static inline long syscall_get_error(struct task_struct *task,
                                     struct pt_regs *regs)
 {
index e286dc58476e6e6c5d126866a8590a96e4b4089a..ff415b3c0a8ef159497a541656e4f18912181054 100644 (file)
@@ -61,6 +61,14 @@ static inline void syscall_get_arguments(struct task_struct *task,
        memcpy(&args[1], &regs->regs[5], 5 * sizeof(long));
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        unsigned long *args)
+{
+       regs->orig_a0 = args[0];
+       memcpy(&regs->regs[5], &args[1], 5 * sizeof(long));
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        return AUDIT_ARCH_LOONGARCH64;
index 056aa1b713e23a3fb5722619d4e4996e211cbdf3..f1926ce30d4bc6a2d929c1e21d6625a3c928dd78 100644 (file)
@@ -74,6 +74,23 @@ static inline void mips_get_syscall_arg(unsigned long *arg,
 #endif
 }
 
+static inline void mips_set_syscall_arg(unsigned long *arg,
+       struct task_struct *task, struct pt_regs *regs, unsigned int n)
+{
+#ifdef CONFIG_32BIT
+       switch (n) {
+       case 0: case 1: case 2: case 3:
+               regs->regs[4 + n] = *arg;
+               return;
+       case 4: case 5: case 6: case 7:
+               *arg = regs->args[n] = *arg;
+               return;
+       }
+#else
+       regs->regs[4 + n] = *arg;
+#endif
+}
+
 static inline long syscall_get_error(struct task_struct *task,
                                     struct pt_regs *regs)
 {
@@ -120,6 +137,17 @@ static inline void syscall_get_arguments(struct task_struct *task,
                mips_get_syscall_arg(args++, task, regs, i++);
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        unsigned long *args)
+{
+       unsigned int i = 0;
+       unsigned int n = 6;
+
+       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[];
index fff52205fb6525d2cc64a211467a97a159dff175..526449edd768c01b6f0a218807e768bd0e4686f8 100644 (file)
@@ -58,6 +58,17 @@ static inline void syscall_get_arguments(struct task_struct *task,
        *args   = regs->r9;
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+       struct pt_regs *regs, const unsigned long *args)
+{
+       regs->r4 = *args++;
+       regs->r5 = *args++;
+       regs->r6 = *args++;
+       regs->r7 = *args++;
+       regs->r8 = *args++;
+       regs->r9 = *args;
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        return AUDIT_ARCH_NIOS2;
index 903ed882bdecf7f2f281223ac0a449cec9b9b3e4..e6383be2a19522cf9f2d2830f2a73668a7dec113 100644 (file)
@@ -57,6 +57,13 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
        memcpy(args, &regs->gpr[3], 6 * sizeof(args[0]));
 }
 
+static inline void
+syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
+                     const unsigned long *args)
+{
+       memcpy(&regs->gpr[3], args, 6 * sizeof(args[0]));
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        return AUDIT_ARCH_OPENRISC;
index 00b127a5e09baae884f2334988440631a62a33a8..b146d0ae4c77aa2697794964485fc1a5b7497dd0 100644 (file)
@@ -29,6 +29,18 @@ static inline void syscall_get_arguments(struct task_struct *tsk,
        args[0] = regs->gr[26];
 }
 
+static inline void syscall_set_arguments(struct task_struct *tsk,
+                                        struct pt_regs *regs,
+                                        unsigned long *args)
+{
+       regs->gr[21] = args[5];
+       regs->gr[22] = args[4];
+       regs->gr[23] = args[3];
+       regs->gr[24] = args[2];
+       regs->gr[25] = args[1];
+       regs->gr[26] = args[0];
+}
+
 static inline long syscall_get_error(struct task_struct *task,
                                     struct pt_regs *regs)
 {
index 3dd36c5e334a9d628b01a738bd32a8f80c45976a..b2715448a660700ecb6d19a63cf859e8697e5590 100644 (file)
@@ -110,6 +110,16 @@ static inline void syscall_get_arguments(struct task_struct *task,
        }
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       memcpy(&regs->gpr[3], args, 6 * sizeof(args[0]));
+
+       /* Also copy the first argument into orig_gpr3 */
+       regs->orig_gpr3 = args[0];
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        if (is_tsk_32bit_task(task))
index eceabf59ae482aa1832b09371ddb3ba8cd65f91d..da56417b6705ba3ecdfb71349f11fc944e193624 100644 (file)
@@ -69,6 +69,18 @@ static inline void syscall_get_arguments(struct task_struct *task,
        args[5] = regs->a5;
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       regs->orig_a0 = args[0];
+       regs->a1 = args[1];
+       regs->a2 = args[2];
+       regs->a3 = args[3];
+       regs->a4 = args[4];
+       regs->a5 = args[5];
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
 #ifdef CONFIG_64BIT
index 0213ec800b5767cecb4ec8a2681163b4d3df10c1..b87d8bb2cbaa929e215872edf890a2bc57275508 100644 (file)
@@ -76,6 +76,15 @@ static inline void syscall_get_arguments(struct task_struct *task,
        args[0] = regs->orig_gpr2 & mask;
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       regs->orig_gpr2 = args[0];
+       for (int n = 1; n < 6; n++)
+               regs->gprs[2 + n] = args[n];
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
 #ifdef CONFIG_COMPAT
index d87738eebe30cb39ad53686c5c58efcf3ec9643f..cb51a752838425e85b8735143e3b73fdd32700de 100644 (file)
@@ -57,6 +57,18 @@ static inline void syscall_get_arguments(struct task_struct *task,
        args[0] = regs->regs[4];
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       regs->regs[1] = args[5];
+       regs->regs[0] = args[4];
+       regs->regs[7] = args[3];
+       regs->regs[6] = args[2];
+       regs->regs[5] = args[1];
+       regs->regs[4] = args[0];
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        int arch = AUDIT_ARCH_SH;
index 20c109ac8cc99524cff7a2f60fca9995d880c71c..62a5a78804c46d76f5155d337117f8c7fee0baf1 100644 (file)
@@ -117,6 +117,16 @@ static inline void syscall_get_arguments(struct task_struct *task,
        }
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       unsigned int i;
+
+       for (i = 0; i < 6; i++)
+               regs->u_regs[UREG_I0 + i] = args[i];
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
 #if defined(CONFIG_SPARC64) && defined(CONFIG_COMPAT)
index 172b74143c4bf1da35519e53965a1ce54e287b9d..2984feb9d5762f224d2d9de987e26b4fcf77a556 100644 (file)
@@ -62,6 +62,20 @@ static inline void syscall_get_arguments(struct task_struct *task,
        *args   = UPT_SYSCALL_ARG6(r);
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       struct uml_pt_regs *r = &regs->regs;
+
+       UPT_SYSCALL_ARG1(r) = *args++;
+       UPT_SYSCALL_ARG2(r) = *args++;
+       UPT_SYSCALL_ARG3(r) = *args++;
+       UPT_SYSCALL_ARG4(r) = *args++;
+       UPT_SYSCALL_ARG5(r) = *args++;
+       UPT_SYSCALL_ARG6(r) = *args;
+}
+
 /* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */
 
 #endif /* __UM_SYSCALL_GENERIC_H */
index 7c488ff0c7641be3159fbc319f7bf8facfd8b4bb..b9c249dd9e3d76f3406cd3a1602337e8f15121f2 100644 (file)
@@ -90,6 +90,18 @@ static inline void syscall_get_arguments(struct task_struct *task,
        args[5] = regs->bp;
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       regs->bx = args[0];
+       regs->cx = args[1];
+       regs->dx = args[2];
+       regs->si = args[3];
+       regs->di = args[4];
+       regs->bp = 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_struct *task,
        }
 }
 
+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 = *args++;
+               regs->cx = *args++;
+               regs->dx = *args++;
+               regs->si = *args++;
+               regs->di = *args++;
+               regs->bp = *args;
+       } else
+# endif
+       {
+               regs->di = *args++;
+               regs->si = *args++;
+               regs->dx = *args++;
+               regs->r10 = *args++;
+               regs->r8 = *args++;
+               regs->r9 = *args;
+       }
+}
+
 static inline int syscall_get_arch(struct task_struct *task)
 {
        /* x32 tasks should be considered AUDIT_ARCH_X86_64. */
index 5ee974bf83305afc3a1bbc851aaa32dfc1ce5975..f9a671cbf9338003704de9c2daf006219b1b8eb9 100644 (file)
@@ -68,6 +68,17 @@ static inline void syscall_get_arguments(struct task_struct *task,
                args[i] = regs->areg[reg[i]];
 }
 
+static inline void syscall_set_arguments(struct task_struct *task,
+                                        struct pt_regs *regs,
+                                        const unsigned long *args)
+{
+       static const unsigned int reg[] = XTENSA_SYSCALL_ARGUMENT_REGS;
+       unsigned int i;
+
+       for (i = 0; i < 6; ++i)
+               regs->areg[reg[i]] = args[i];
+}
+
 asmlinkage long xtensa_rt_sigreturn(void);
 asmlinkage long xtensa_shmat(int, char __user *, int);
 asmlinkage long xtensa_fadvise64_64(int, int,
index 182b039ce5fa100cb9a2189b0f7299a7f8ab6779..292b412f4e9a56b9bb0339340b6a473622bd5541 100644 (file)
@@ -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);
 
+/**
+ * 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