lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 15 Apr 2019 20:59:08 +0200 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: linux-kernel@...r.kernel.org Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org, Ingo Molnar <mingo@...hat.com>, Kees Cook <keescook@...omium.org>, Andy Lutomirski <luto@...capital.net>, Will Drewry <wad@...omium.org>, Albert Ou <aou@...s.berkeley.edu>, linux-riscv@...ts.infradead.org, Palmer Dabbelt <palmer@...ive.com>, "Dmitry V. Levin" <ldv@...linux.org>, "Steven Rostedt (VMware)" <rostedt@...dmis.org> Subject: [PATCH 4.19 070/101] riscv: Fix syscall_get_arguments() and syscall_set_arguments() From: Dmitry V. Levin <ldv@...linux.org> commit 10a16997db3d99fc02c026cf2c6e6c670acafab0 upstream. 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@...hat.com> Cc: Kees Cook <keescook@...omium.org> Cc: Andy Lutomirski <luto@...capital.net> Cc: Will Drewry <wad@...omium.org> Cc: Albert Ou <aou@...s.berkeley.edu> Cc: linux-riscv@...ts.infradead.org Cc: stable@...r.kernel.org # v4.15+ Acked-by: Palmer Dabbelt <palmer@...ive.com> Signed-off-by: Dmitry V. Levin <ldv@...linux.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@...dmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- arch/riscv/include/asm/syscall.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/arch/riscv/include/asm/syscall.h +++ b/arch/riscv/include/asm/syscall.h @@ -78,10 +78,11 @@ static inline void syscall_get_arguments if (i == 0) { args[0] = regs->orig_a0; args++; - i++; n--; + } else { + i--; } - memcpy(args, ®s->a1 + i * sizeof(regs->a1), n * sizeof(args[0])); + memcpy(args, ®s->a1 + i, n * sizeof(args[0])); } static inline void syscall_set_arguments(struct task_struct *task, @@ -93,10 +94,11 @@ static inline void syscall_set_arguments if (i == 0) { regs->orig_a0 = args[0]; args++; - i++; n--; - } - memcpy(®s->a1 + i * sizeof(regs->a1), args, n * sizeof(regs->a0)); + } else { + i--; + } + memcpy(®s->a1 + i, args, n * sizeof(regs->a1)); } #endif /* _ASM_RISCV_SYSCALL_H */
Powered by blists - more mailing lists