diff options
| author | Guo Ren <ren_guo@c-sky.com> | 2019-04-22 14:46:44 +0800 |
|---|---|---|
| committer | Guo Ren <ren_guo@c-sky.com> | 2019-04-22 15:55:28 +0800 |
| commit | a691f3334d58b833e41d56de1b9820e687edcd78 (patch) | |
| tree | a5da17a314196bf4a97eae43557754712f6d172f /arch/csky | |
| parent | 1a23710c71bbfe2df10584afb9971b99c45e2576 (diff) | |
| download | linux-a691f3334d58b833e41d56de1b9820e687edcd78.tar.gz linux-a691f3334d58b833e41d56de1b9820e687edcd78.tar.bz2 linux-a691f3334d58b833e41d56de1b9820e687edcd78.zip | |
csky/syscall_trace: Fixup return processing flow
The function tracehook_report_syscall_entry's return value is
__must_check attribute. We should add return processing flow in
ptrace.c and set the syscall number to -1 when failed just like
riscv's.
Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/csky')
| -rw-r--r-- | arch/csky/include/asm/syscall.h | 7 | ||||
| -rw-r--r-- | arch/csky/kernel/ptrace.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/csky/include/asm/syscall.h b/arch/csky/include/asm/syscall.h index 850b694a463e..8278658e74f9 100644 --- a/arch/csky/include/asm/syscall.h +++ b/arch/csky/include/asm/syscall.h @@ -17,6 +17,13 @@ syscall_get_nr(struct task_struct *task, struct pt_regs *regs) } static inline void +syscall_set_nr(struct task_struct *task, struct pt_regs *regs, + int sysno) +{ + regs_syscallid(regs) = sysno; +} + +static inline void syscall_rollback(struct task_struct *task, struct pt_regs *regs) { regs->a0 = regs->orig_a0; diff --git a/arch/csky/kernel/ptrace.c b/arch/csky/kernel/ptrace.c index 91bc74bb569f..313623a19ecb 100644 --- a/arch/csky/kernel/ptrace.c +++ b/arch/csky/kernel/ptrace.c @@ -215,7 +215,8 @@ long arch_ptrace(struct task_struct *child, long request, asmlinkage void syscall_trace_enter(struct pt_regs *regs) { if (test_thread_flag(TIF_SYSCALL_TRACE)) - tracehook_report_syscall_entry(regs); + if (tracehook_report_syscall_entry(regs)) + syscall_set_nr(current, regs, -1); if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) trace_sys_enter(regs, syscall_get_nr(current, regs)); |