From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD31C3F9FB for ; Thu, 16 Jan 2025 02:20:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736994010; cv=none; b=WNskhsl+sbxCpPRNdEaJS44jg4lrrs398UvrfetzTdmq4W6YGnI3hwklevZpeGrgz05+Wi0zrjQ6BNkYu5rccbbFu4g5J3nu35QABd4vTs2ZGU01N2tZL4i8VCdglnUxB0/tw1gxf3nEFkkU5x10UyVUDO1MUCfxHryOmZhGgo8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736994010; c=relaxed/simple; bh=Pw15srYt8+MWpPPmoJehL4juw0VEUT4PG0GHz5BjmNU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Qr5yWejyL+EaTr7hZ96LPLCffY1lKVsPODw4mX6uk7vY05FyVBq2R6ursDug1CLPPRHtOmO9jb/yqJU3vG8MD0R/mND9JbhRZNj8i4AuHH5HjgDLEAyRvmPf0colg1/YKT1KahGg0FammzYs9fsLAIB7xYauFOW8s2OM0+EiTUM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=enh1Crvi; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="enh1Crvi" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21bc1512a63so6977715ad.1 for ; Wed, 15 Jan 2025 18:20:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1736994007; x=1737598807; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=0fSeCZdQhm9gsDo9x4mCdX/gIYtNCLSrunBW4bVeNiY=; b=enh1Crvi/U/8D94HiIy8EOsPhA9jJJzbvbNPaj9FLQosrv0nK7D703B6JLAKsYinkB wKIzltTWFeX24/OD87iEFIx2GGVNmF6MIDvBBQS5WOAUiGT7lIroJ9JYnhZZ78x5xFcu grHe37dZRCDmGbIq3ah3vHTplo5kUovuKI+/DN3jG5ISIhdiN4ExtvHQVvnxcQE9pbHf BwPnOYbdpqk6/3w7bujAhoBYcshZtY9v0NSf7rhX/+2fD79namA163YeFXLGcTkbNsu+ EXu30vMkXZSCO4a+vR3rDBAmdJCUc6dBvLinCJ1Et/JvLhgDqbcLS3SVVnSAhKxp350J GduQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736994007; x=1737598807; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0fSeCZdQhm9gsDo9x4mCdX/gIYtNCLSrunBW4bVeNiY=; b=bq1Xchbv1/gLQ5PbiJgjO/UGh2UHKokktgPez+8VPr4qnYdVdV4+qhSaUNqW7p96sE f9pzeyoCXa7UVKjKBu7o0jPeHb7fbF6Pw263Y2e3yiMTGF+vLkFrxYFr3lQfP1YljQBP R/lWQsMsOXjDLDQUALU6I7t3N9/RVvw74VujNsatcSdzO1ZYTf3UWUBH4WlBUAfY6MhM jcauN023Xh7Jm+EyPpt0MdOAWv4p7a//Ij8M/ehCdEDQkexlByb0Ci1/vjpu+e/Mlgkl UQyq/Sj0N3jQsdqr/WgWbXR0WmiA+3qHE1E/ZPCoanMV6V2EVpbbACwMEC4AhmuCVuaB /XbQ== X-Forwarded-Encrypted: i=1; AJvYcCU31eFcu4wq8RAoNtOjqEglZ0nk2B+bOQHX5rnL3BWXlCgzIUqSApbwohe66tdghCydyOzzDo4c2g==@vger.kernel.org X-Gm-Message-State: AOJu0YwziCllTKcrV5cvcYmXSszjb1Qt2Nm/bo0w64e+jxn+v1NTRa8l Ci40+T1c8+C9A7wTRzcmt7I4V5ydC9pNIlbEpfpMUEXAX9AwtQRzOiz7Z+72tjk= X-Gm-Gg: ASbGncvfew5LQuaNUYAlSXFBp2VlOpz8lxP7q0WE6jX0gmycuSt2iqSj7+wZqrHpQDJ JhvCf1nXCuVbav00ddRZx0tMLWeDtb6G3MG5Wf8MQUJKR0R3YriyzWnGd8JL+lXIO7I5QHY0hON lEmbeSpSiTpqPwQGX+SGClnkWmyCqEJIG+qd6ZQ0HIA02TtOp8VnhYa+WI/kD2OnW1dku2MjYMK HPE+n/7+s+D5gLYPHRGRAOur0e498QLPxgXLpqUMTNmjjI= X-Google-Smtp-Source: AGHT+IG2iJViDjIXN/MIil+T+MrVrX+exq0uA4y6qY7j2BWAir2l1c6Zqr9kSueuyp3qmDsRK279Sw== X-Received: by 2002:a17:903:41c3:b0:216:3732:ade3 with SMTP id d9443c01a7336-21a83fc3c07mr485898695ad.35.1736994006875; Wed, 15 Jan 2025 18:20:06 -0800 (PST) Received: from ghost ([50.145.13.30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21a9f10def6sm89028935ad.38.2025.01.15.18.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 18:20:06 -0800 (PST) Date: Wed, 15 Jan 2025 18:20:01 -0800 From: Charlie Jenkins To: "Dmitry V. Levin" Cc: Oleg Nesterov , Eugene Syromyatnikov , Mike Frysinger , Renzo Davoli , Davide Berardi , strace-devel@lists.strace.io, Vineet Gupta , Russell King , Will Deacon , Guo Ren , Brian Cain , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , Dinh Nguyen , Jonas Bonn , Stefan Kristiansson , Stafford Horne , "James E.J. Bottomley" , Helge Deller , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , 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-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, 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: Re: [PATCH v2 3/7] syscall.h: add syscall_set_arguments() and syscall_set_return_value() Message-ID: References: <20250113170925.GA392@strace.io> <20250113171140.GC589@strace.io> Precedence: bulk X-Mailing-List: linux-sh@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250113171140.GC589@strace.io> On Mon, Jan 13, 2025 at 07:11:40PM +0200, Dmitry V. Levin wrote: > These functions are 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. > > Signed-off-by: Dmitry V. Levin > --- > > Note that I'm not a MIPS expert, I just added mips_set_syscall_arg() by > looking at mips_get_syscall_arg() and the result passes tests in qemu on > mips O32, mips64 O32, mips64 N32, and mips64 N64. > > 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 | 14 +++++++++++ > arch/loongarch/include/asm/syscall.h | 8 ++++++ > arch/mips/include/asm/syscall.h | 32 ++++++++++++++++++++++++ > arch/nios2/include/asm/syscall.h | 11 ++++++++ > arch/openrisc/include/asm/syscall.h | 7 ++++++ > arch/parisc/include/asm/syscall.h | 12 +++++++++ > 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 ++++++++++++ > 19 files changed, 267 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 pt_regs *regs, > } > } > > +static inline void > +syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, > + unsigned long *args) > +{ > + unsigned long *inside_ptregs = ®s->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) > { > 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_struct *task, > memcpy(args, ®s->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(®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 = 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/syscall.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_struct *task, > memcpy(args, ®s->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(®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 = 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/syscall.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 pt_regs *regs, > memcpy(args, ®s->a1, 5 * sizeof(args[0])); > } > > +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 = 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..1024a6548d78 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_struct *task, > memcpy(args, &(®s->r00)[0], 6 * sizeof(args[0])); > } > > +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) > { > @@ -45,6 +52,13 @@ static inline long syscall_get_return_value(struct task_struct *task, > return regs->r00; > } > > +static inline void syscall_set_return_value(struct task_struct *task, > + struct pt_regs *regs, > + int error, long val) > +{ > + regs->r00 = (long) error ?: val; > +} > + > static inline int syscall_get_arch(struct task_struct *task) > { > return AUDIT_ARCH_HEXAGON; > 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_struct *task, > memcpy(&args[1], ®s->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(®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/syscall.h > index 2f85f2d8f754..3163d1506fae 100644 > --- a/arch/mips/include/asm/syscall.h > +++ b/arch/mips/include/asm/syscall.h > @@ -76,6 +76,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->pad0[n] = *arg; > + return; > + } > +#else > + regs->regs[4 + n] = *arg; > +#endif > +} > + > static inline long syscall_get_error(struct task_struct *task, > struct pt_regs *regs) > { > @@ -122,6 +139,21 @@ 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; > + > + /* 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/nios2/include/asm/syscall.h b/arch/nios2/include/asm/syscall.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_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; > diff --git a/arch/openrisc/include/asm/syscall.h b/arch/openrisc/include/asm/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 pt_regs *regs, > memcpy(args, ®s->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(®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/parisc/include/asm/syscall.h b/arch/parisc/include/asm/syscall.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_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) > { > diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h > index 422d7735ace6..521f279e6b33 100644 > --- a/arch/powerpc/include/asm/syscall.h > +++ b/arch/powerpc/include/asm/syscall.h > @@ -114,6 +114,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(®s->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)) > diff --git a/arch/riscv/include/asm/syscall.h b/arch/riscv/include/asm/syscall.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_struct *task, > memcpy(args, ®s->a1, 5 * sizeof(args[0])); > } > > +static inline void syscall_set_arguments(struct task_struct *task, > + struct pt_regs *regs, > + const unsigned long *args) > +{ > + regs->orig_a0 = args[0]; > + args++; > + memcpy(®s->a1, args, 5 * sizeof(regs->a1)); > +} Looks good for riscv. Tested-by: Charlie Jenkins Reviewed-by: Charlie Jenkins + > 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/syscall.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_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) > +{ > + unsigned int n = 6; > + > + while (n-- > 0) > + if (n > 0) > + regs->gprs[2 + n] = args[n]; > + regs->orig_gpr2 = 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_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; > diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.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_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) > diff --git a/arch/um/include/asm/syscall-generic.h b/arch/um/include/asm/syscall-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_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 = ®s->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 */ > 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_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. */ > diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.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_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, > 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); > > +/** > + * 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 > -- > ldv