p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

csky: Fix syscall_get_arguments() and syscall_set_arguments() 

C-SKY syscall arguments are located in orig_a0,a1,a2,a3,regs[0],regs[1]
fields of struct pt_regs.

Due to an off-by-one bug and a bug in pointer arithmetic
syscall_get_arguments() was reading orig_a0,regs[1..5] fields instead.
Likewise, syscall_set_arguments() was writing orig_a0,regs[1..5] fields
instead.

Link: http://lkml.kernel.org/r/20190329171230.GB32456@altlinux.org

Fixes: 4859bfca11 ("csky: System Call")
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Will Drewry <wad@chromium.org>
Cc: stable@vger.kernel.org # v4.20+
Tested-by: Guo Ren <ren_guo@c-sky.com>
Acked-by: Guo Ren <ren_guo@c-sky.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Dmitry V. Levin 2019-03-29 20:12:30 +03:00 committed by Steven Rostedt (VMware)
parent 10a16997db
commit ed3bb00702
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/csky/include/asm/syscall.h
View File

@ -49,10 +49,11 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,
if (i == 0) { if (i == 0) {
args[0] = regs->orig_a0; args[0] = regs->orig_a0;
args++; args++;
i++;
n--; n--;
} else {
i--;
} }
memcpy(args, &regs->a1 + i * sizeof(regs->a1), n * sizeof(args[0])); memcpy(args, &regs->a1 + i, n * sizeof(args[0]));
} }
static inline void static inline void
@ -63,10 +64,11 @@ syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,
if (i == 0) { if (i == 0) {
regs->orig_a0 = args[0]; regs->orig_a0 = args[0];
args++; args++;
i++;
n--; n--;
} else {
i--;
} }
memcpy(&regs->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0)); memcpy(&regs->a1 + i, args, n * sizeof(regs->a1));
} }
static inline int static inline int