Skip to content

Commit

Permalink
syscalls: Remove start and number from syscall_set_arguments() args
Browse files Browse the repository at this point in the history 
After removing the start and count arguments of syscall_get_arguments() it
seems reasonable to remove them from syscall_set_arguments(). Note, as of
today, there are no users of syscall_set_arguments(). But we are told that
there will be soon. But for now, at least make it consistent with
syscall_get_arguments().

Link: http://lkml.kernel.org/r/20190327222014.GA32540@altlinux.org

Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Dave Martin <dave.martin@arm.com>
Cc: "Dmitry V. Levin" <ldv@altlinux.org>
Cc: x86@kernel.org
Cc: linux-snps-arc@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: uclinux-h8-devel@lists.sourceforge.jp
Cc: linux-hexagon@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-mips@vger.kernel.org
Cc: nios2-dev@lists.rocketboards.org
Cc: openrisc@lists.librecores.org
Cc: linux-parisc@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-riscv@lists.infradead.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: linux-um@lists.infradead.org
Cc: linux-xtensa@linux-xtensa.org
Cc: linux-arch@vger.kernel.org
Acked-by: Max Filippov <jcmvbkbc@gmail.com> # For xtensa changes
Acked-by: Will Deacon <will.deacon@arm.com> # For the arm64 bits
Reviewed-by: Thomas Gleixner <tglx@linutronix.de> # for x86
Reviewed-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (VMware) committed Apr 5, 2019
1 parent b35f549 commit 32d9258
Show file tree
Hide file tree
Showing 20 changed files with 88 additions and 304 deletions.
22 changes: 4 additions & 18 deletions arch/arm/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,12 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
if (n == 0)
return;

if (i + n > SYSCALL_MAX_ARGS) {
pr_warn("%s called with max args %d, handling only %d\n",
__func__, i + n, SYSCALL_MAX_ARGS);
n = SYSCALL_MAX_ARGS - i;
}

if (i == 0) {
regs->ARM_ORIG_r0 = args[0];
args++;
i++;
n--;
}

memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));
regs->ARM_ORIG_r0 = args[0];
args++;

memcpy(&regs->ARM_r0 + 1, args, 5 * sizeof(args[0]));
}

static inline int syscall_get_arch(void)
Expand Down
22 changes: 4 additions & 18 deletions arch/arm64/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,26 +75,12 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
if (n == 0)
return;

if (i + n > SYSCALL_MAX_ARGS) {
pr_warning("%s called with max args %d, handling only %d\n",
__func__, i + n, SYSCALL_MAX_ARGS);
n = SYSCALL_MAX_ARGS - i;
}

if (i == 0) {
regs->orig_x0 = args[0];
args++;
i++;
n--;
}

memcpy(&regs->regs[i], args, n * sizeof(args[0]));
regs->orig_x0 = args[0];
args++;

memcpy(&regs->regs[1], args, 5 * sizeof(args[0]));
}

/*
Expand Down
38 changes: 6 additions & 32 deletions arch/c6x/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,40 +59,14 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
switch (i) {
case 0:
if (!n--)
break;
regs->a4 = *args++;
case 1:
if (!n--)
break;
regs->b4 = *args++;
case 2:
if (!n--)
break;
regs->a6 = *args++;
case 3:
if (!n--)
break;
regs->b6 = *args++;
case 4:
if (!n--)
break;
regs->a8 = *args++;
case 5:
if (!n--)
break;
regs->a9 = *args++;
case 6:
if (!n)
break;
default:
BUG();
}
regs->a4 = *args++;
regs->b4 = *args++;
regs->a6 = *args++;
regs->b6 = *args++;
regs->a8 = *args++;
regs->a9 = *args;
}

#endif /* __ASM_C6X_SYSCALLS_H */
14 changes: 4 additions & 10 deletions arch/csky/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,11 @@ 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 int i, unsigned int n, const unsigned long *args)
const unsigned long *args)
{
BUG_ON(i + n > 6);
if (i == 0) {
regs->orig_a0 = args[0];
args++;
n--;
} else {
i--;
}
memcpy(&regs->a1 + i, args, n * sizeof(regs->a1));
regs->orig_a0 = args[0];
args++;
memcpy(&regs->a1, args, 5 * sizeof(regs->a1));
}

static inline int
Expand Down
10 changes: 3 additions & 7 deletions arch/ia64/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,19 @@ static inline void syscall_set_return_value(struct task_struct *task,
}

extern void ia64_syscall_get_set_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned int i, unsigned int n,
unsigned long *args, int rw);
struct pt_regs *regs, unsigned long *args, int rw);
static inline void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned long *args)
{
ia64_syscall_get_set_arguments(task, regs, 0, 6, args, 0);
ia64_syscall_get_set_arguments(task, regs, args, 0);
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
unsigned long *args)
{
BUG_ON(i + n > 6);

ia64_syscall_get_set_arguments(task, regs, i, n, args, 1);
ia64_syscall_get_set_arguments(task, regs, args, 1);
}

static inline int syscall_get_arch(void)
Expand Down
7 changes: 3 additions & 4 deletions arch/ia64/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2179,12 +2179,11 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data)
}

void ia64_syscall_get_set_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned int i, unsigned int n,
unsigned long *args, int rw)
struct pt_regs *regs, unsigned long *args, int rw)
{
struct syscall_get_set_args data = {
.i = i,
.n = n,
.i = 0,
.n = 6,
.args = args,
.regs = regs,
.rw = rw,
Expand Down
4 changes: 3 additions & 1 deletion arch/microblaze/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
unsigned int i = 0;
unsigned int n = 6;

while (n--)
microblaze_set_syscall_arg(regs, i++, *args++);
}
Expand Down
29 changes: 5 additions & 24 deletions arch/nds32/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,39 +129,20 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
* 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
* @i: argument index [0,5]
* @n: number of arguments; n+i must be [1,6].
* @args: array of argument values to store
*
* Changes @n arguments to the system call starting with the @i'th argument.
* Argument @i gets value @args[0], and so on.
* An arch inline version is probably optimal when @i and @n are constants.
* 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 %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.
* It's invalid to call this with @i + @n > 6; we only support system calls
* taking up to 6 arguments.
*/
void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
if (n == 0)
return;

if (i + n > SYSCALL_MAX_ARGS) {
pr_warn("%s called with max args %d, handling only %d\n",
__func__, i + n, SYSCALL_MAX_ARGS);
n = SYSCALL_MAX_ARGS - i;
}

if (i == 0) {
regs->orig_r0 = args[0];
args++;
i++;
n--;
}
regs->orig_r0 = args[0];
args++;

memcpy(&regs->uregs[0] + i, args, n * sizeof(args[0]));
memcpy(&regs->uregs[0] + 1, args, 5 * sizeof(args[0]));
}
#endif /* _ASM_NDS32_SYSCALL_H */
42 changes: 7 additions & 35 deletions arch/nios2/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,42 +69,14 @@ static inline void syscall_get_arguments(struct task_struct *task,
}

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs, unsigned int i, unsigned int n,
const unsigned long *args)
struct pt_regs *regs, const unsigned long *args)
{
BUG_ON(i + n > 6);

switch (i) {
case 0:
if (!n--)
break;
regs->r4 = *args++;
case 1:
if (!n--)
break;
regs->r5 = *args++;
case 2:
if (!n--)
break;
regs->r6 = *args++;
case 3:
if (!n--)
break;
regs->r7 = *args++;
case 4:
if (!n--)
break;
regs->r8 = *args++;
case 5:
if (!n--)
break;
regs->r9 = *args++;
case 6:
if (!n)
break;
default:
BUG();
}
regs->r4 = *args++;
regs->r5 = *args++;
regs->r6 = *args++;
regs->r7 = *args++;
regs->r8 = *args++;
regs->r9 = *args;
}

#endif
6 changes: 2 additions & 4 deletions arch/openrisc/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,9 @@ 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 int i, unsigned int n, const unsigned long *args)
const unsigned long *args)
{
BUG_ON(i + n > 6);

memcpy(&regs->gpr[3 + i], args, n * sizeof(args[0]));
memcpy(&regs->gpr[3], args, 6 * sizeof(args[0]));
}

static inline int syscall_get_arch(void)
Expand Down
7 changes: 2 additions & 5 deletions arch/powerpc/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,12 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
BUG_ON(i + n > 6);
memcpy(&regs->gpr[3 + i], args, n * sizeof(args[0]));
memcpy(&regs->gpr[3], args, 6 * sizeof(args[0]));

/* Also copy the first argument into orig_gpr3 */
if (i == 0 && n > 0)
regs->orig_gpr3 = args[0];
regs->orig_gpr3 = args[0];
}

static inline int syscall_get_arch(void)
Expand Down
13 changes: 3 additions & 10 deletions arch/riscv/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,11 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
BUG_ON(i + n > 6);
if (i == 0) {
regs->orig_a0 = args[0];
args++;
n--;
} else {
i--;
}
memcpy(&regs->a1 + i, args, n * sizeof(regs->a1));
regs->orig_a0 = args[0];
args++;
memcpy(&regs->a1, args, 5 * sizeof(regs->a1));
}

static inline int syscall_get_arch(void)
Expand Down
11 changes: 5 additions & 6 deletions arch/s390/include/asm/syscall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,14 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
BUG_ON(i + n > 6);
unsigned int n = 6;

while (n-- > 0)
if (i + n > 0)
regs->gprs[2 + i + n] = args[n];
if (i == 0)
regs->orig_gpr2 = args[0];
if (n > 0)
regs->gprs[2 + n] = args[n];
regs->orig_gpr2 = args[0];
}

static inline int syscall_get_arch(void)
Expand Down
21 changes: 6 additions & 15 deletions arch/sh/include/asm/syscall_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,14 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
/* Same note as above applies */
BUG_ON(i);

switch (n) {
case 6: regs->regs[1] = args[5];
case 5: regs->regs[0] = args[4];
case 4: regs->regs[7] = args[3];
case 3: regs->regs[6] = args[2];
case 2: regs->regs[5] = args[1];
case 1: regs->regs[4] = args[0];
break;
default:
BUG();
}
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(void)
Expand Down
4 changes: 1 addition & 3 deletions arch/sh/include/asm/syscall_64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ static inline void syscall_get_arguments(struct task_struct *task,

static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned int i, unsigned int n,
const unsigned long *args)
{
BUG_ON(i + n > 6);
memcpy(&regs->regs[2 + i], args, n * sizeof(args[0]));
memcpy(&regs->regs[2], args, 6 * sizeof(args[0]));
}

static inline int syscall_get_arch(void)
Expand Down
Loading

0 comments on commit 32d9258

Please sign in to comment.