Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 4859bfca11c7d ("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>

authored by

Dmitry V. Levin and committed by
Steven Rostedt (VMware)
ed3bb007 10a16997

+6 -4
+6 -4
arch/csky/include/asm/syscall.h
··· 49 49 if (i == 0) { 50 50 args[0] = regs->orig_a0; 51 51 args++; 52 - i++; 53 52 n--; 53 + } else { 54 + i--; 54 55 } 55 - memcpy(args, &regs->a1 + i * sizeof(regs->a1), n * sizeof(args[0])); 56 + memcpy(args, &regs->a1 + i, n * sizeof(args[0])); 56 57 } 57 58 58 59 static inline void ··· 64 63 if (i == 0) { 65 64 regs->orig_a0 = args[0]; 66 65 args++; 67 - i++; 68 66 n--; 67 + } else { 68 + i--; 69 69 } 70 - memcpy(&regs->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0)); 70 + memcpy(&regs->a1 + i, args, n * sizeof(regs->a1)); 71 71 } 72 72 73 73 static inline int