|
@@ -24,6 +24,7 @@
|
|
|
#include <linux/smp.h>
|
|
|
#include <linux/user.h>
|
|
|
#include <linux/security.h>
|
|
|
+#include <linux/tracehook.h>
|
|
|
#include <linux/audit.h>
|
|
|
#include <linux/seccomp.h>
|
|
|
|
|
@@ -540,28 +541,9 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
|
|
|
/* do the secure computing check first */
|
|
|
secure_computing_strict(regs->regs[2]);
|
|
|
|
|
|
- if (!(current->ptrace & PT_PTRACED))
|
|
|
- goto out;
|
|
|
+ if (test_thread_flag(TIF_SYSCALL_TRACE))
|
|
|
+ ptrace_report_syscall(regs);
|
|
|
|
|
|
- if (!test_thread_flag(TIF_SYSCALL_TRACE))
|
|
|
- goto out;
|
|
|
-
|
|
|
- /* The 0x80 provides a way for the tracing parent to distinguish
|
|
|
- between a syscall stop and SIGTRAP delivery */
|
|
|
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ?
|
|
|
- 0x80 : 0));
|
|
|
-
|
|
|
- /*
|
|
|
- * this isn't the same as continuing with a signal, but it will do
|
|
|
- * for normal use. strace only continues with a signal if the
|
|
|
- * stopping signal is not SIGTRAP. -brl
|
|
|
- */
|
|
|
- if (current->exit_code) {
|
|
|
- send_sig(current->exit_code, current, 1);
|
|
|
- current->exit_code = 0;
|
|
|
- }
|
|
|
-
|
|
|
-out:
|
|
|
audit_syscall_entry(audit_arch(), regs->regs[2],
|
|
|
regs->regs[4], regs->regs[5],
|
|
|
regs->regs[6], regs->regs[7]);
|
|
@@ -582,26 +564,8 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
|
|
|
|
|
|
audit_syscall_exit(regs);
|
|
|
|
|
|
- if (!(current->ptrace & PT_PTRACED))
|
|
|
- return;
|
|
|
-
|
|
|
- if (!test_thread_flag(TIF_SYSCALL_TRACE))
|
|
|
- return;
|
|
|
-
|
|
|
- /* The 0x80 provides a way for the tracing parent to distinguish
|
|
|
- between a syscall stop and SIGTRAP delivery */
|
|
|
- ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ?
|
|
|
- 0x80 : 0));
|
|
|
-
|
|
|
- /*
|
|
|
- * this isn't the same as continuing with a signal, but it will do
|
|
|
- * for normal use. strace only continues with a signal if the
|
|
|
- * stopping signal is not SIGTRAP. -brl
|
|
|
- */
|
|
|
- if (current->exit_code) {
|
|
|
- send_sig(current->exit_code, current, 1);
|
|
|
- current->exit_code = 0;
|
|
|
- }
|
|
|
+ if (test_thread_flag(TIF_SYSCALL_TRACE))
|
|
|
+ tracehook_report_syscall_exit(regs, 0);
|
|
|
|
|
|
user_enter();
|
|
|
}
|