Patch "riscv: Fix syscall_get_arguments() and syscall_set_arguments()" has been added to the 4.19-stable tree
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
riscv: Fix syscall_get_arguments() and syscall_set_arguments()
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
riscv-fix-syscall_get_arguments-and-syscall_set_arguments.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 10a16997db3d99fc02c026cf2c6e6c670acafab0 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <[email protected]>
Date: Fri, 29 Mar 2019 20:12:21 +0300
Subject: riscv: Fix syscall_get_arguments() and syscall_set_arguments()
From: Dmitry V. Levin <[email protected]>
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.
--- arch/riscv/include/asm/syscall.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/riscv/include/asm/syscall.h +7 -5
@@ -78,10 +78,11 @@ static inline void syscall_get_argumentsif (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_argumentsif (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 */
Patches currently in stable-queue which might be from [email protected] are
queue-4.19/riscv-fix-syscall_get_arguments-and-syscall_set_arguments.patch
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv