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

riscv: Fix syscall_get_arguments() and syscall_set_arguments()

RISC-V syscall arguments are located in orig_a0,a1..a5 fields
of struct pt_regs.

Due to an off-by-one bug and a bug in pointer arithmetic
syscall_get_arguments() was reading s3..s7 fields instead of a1..a5.
Likewise, syscall_set_arguments() was writing s3..s7 fields
instead of a1..a5.

Link: http://lkml.kernel.org/r/20190329171221.GA32456@altlinux.org

Fixes: e2c0cdfba7f69 ("RISC-V: User-facing API")
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: Albert Ou <aou@eecs.berkeley.edu>
Cc: linux-riscv@lists.infradead.org
Cc: stable@vger.kernel.org # v4.15+
Acked-by: Palmer Dabbelt <palmer@sifive.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)
10a16997 d08e4113

+7 -5
+7 -5
arch/riscv/include/asm/syscall.h
··· 79 79 if (i == 0) { 80 80 args[0] = regs->orig_a0; 81 81 args++; 82 - i++; 83 82 n--; 83 + } else { 84 + i--; 84 85 } 85 - memcpy(args, &regs->a1 + i * sizeof(regs->a1), n * sizeof(args[0])); 86 + memcpy(args, &regs->a1 + i, n * sizeof(args[0])); 86 87 } 87 88 88 89 static inline void syscall_set_arguments(struct task_struct *task, ··· 95 94 if (i == 0) { 96 95 regs->orig_a0 = args[0]; 97 96 args++; 98 - i++; 99 97 n--; 100 - } 101 - memcpy(&regs->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0)); 98 + } else { 99 + i--; 100 + } 101 + memcpy(&regs->a1 + i, args, n * sizeof(regs->a1)); 102 102 } 103 103 104 104 static inline int syscall_get_arch(void)