csky: fix syscall_get_arguments() and syscall_set_arguments()
PATCH 1/1 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.
Fixes 4859bfca11c7d ("csky: System Call")
Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kees Cook <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Will Drewry <[email protected]>
Cc [email protected] # v4.20+
Signed-off-by Dmitry V. Levin <[email protected]>
--- arch/csky/include/asm/syscall.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/csky/include/asm/syscall.h +6 -4
@@ -49,10 +49,11 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,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
@@ -63,10 +64,11 @@ syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,if (i ==0 ) { regs->orig_a0 = args[0 ]; args++; - i++; n--; + }else { + i--; } -memcpy (®s->a1 + i *sizeof (regs->a1), args, n *sizeof (regs->a0)); +memcpy (®s->a1 + i, args, n *sizeof (regs->a1)); } static inline int
Signature · 1 line
ldv
Thx Dmitry,
It works for me.
Tested-by Guo Ren <[email protected]>
Acked-by Guo Ren <[email protected]>
Quoted 54 lines · Dmitry V. Levin
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.Fixes 4859bfca11c7d ("csky: System Call")Cc Steven Rostedt <[email protected]>Cc Ingo Molnar <[email protected]>Cc Kees Cook <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Will Drewry <[email protected]>Cc [email protected] # v4.20+Signed-off-by Dmitry V. Levin <[email protected]>--- arch/csky/include/asm/syscall.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/csky/include/asm/syscall.h +6
-4@@ -49,10 +49,11 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,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@@ -63,10 +64,11 @@ syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,if (i ==0 ) { regs->orig_a0 = args[0 ]; args++; - i++; n--; + }else { + i--; } -memcpy (®s->a1 + i *sizeof (regs->a1), args, n *sizeof (regs->a0)); +memcpy (®s->a1 + i, args, n *sizeof (regs->a1)); } static inline intSignature · 1 line
ldv