|
@@ -640,7 +640,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
|
|
|
|
|
|
asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
|
|
|
{
|
|
|
- long ret;
|
|
|
+ long ret = 0;
|
|
|
|
|
|
/* Do the secure computing check first. */
|
|
|
secure_computing(regs->gprs[2]);
|
|
@@ -649,7 +649,6 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
|
|
|
* The sysc_tracesys code in entry.S stored the system
|
|
|
* call number to gprs[2].
|
|
|
*/
|
|
|
- ret = regs->gprs[2];
|
|
|
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
|
|
|
(tracehook_report_syscall_entry(regs) ||
|
|
|
regs->gprs[2] >= NR_syscalls)) {
|
|
@@ -671,7 +670,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
|
|
|
regs->gprs[2], regs->orig_gpr2,
|
|
|
regs->gprs[3], regs->gprs[4],
|
|
|
regs->gprs[5]);
|
|
|
- return ret;
|
|
|
+ return ret ?: regs->gprs[2];
|
|
|
}
|
|
|
|
|
|
asmlinkage void do_syscall_trace_exit(struct pt_regs *regs)
|