summaryrefslogtreecommitdiffstats
path: root/include/linux/ptrace.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-06-17 16:50:36 +0200
committerOleg Nesterov <oleg@redhat.com>2011-06-22 19:26:28 +0200
commitf3c04b934d429b1ace21866f011b66de328c0dc9 (patch)
tree16ac465b4f5294f71995554ca1e94913fdeda234 /include/linux/ptrace.h
parent643ad8388e189dfd14ef76972cf7dc394b3cbebd (diff)
downloadlinux-stable-f3c04b934d429b1ace21866f011b66de328c0dc9.tar.gz
linux-stable-f3c04b934d429b1ace21866f011b66de328c0dc9.tar.bz2
linux-stable-f3c04b934d429b1ace21866f011b66de328c0dc9.zip
ptrace: move SIGTRAP on exec(2) logic to ptrace_event()
Move SIGTRAP on exec(2) logic from tracehook_report_exec() to ptrace_event(). This is part of changes to make ptrace_event() smarter and handle ptrace event related details in one place. This doesn't introduce any behavior change. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Diffstat (limited to 'include/linux/ptrace.h')
-rw-r--r--include/linux/ptrace.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 18feac6f441e..b546fd6c3506 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -172,17 +172,17 @@ static inline bool ptrace_event_enabled(struct task_struct *task, int event)
* Check whether @event is enabled and, if so, report @event and @message
* to the ptrace parent.
*
- * Returns nonzero if we did a ptrace notification, zero if not.
- *
* Called without locks.
*/
-static inline int ptrace_event(int event, unsigned long message)
+static inline void ptrace_event(int event, unsigned long message)
{
- if (likely(!ptrace_event_enabled(current, event)))
- return false;
- current->ptrace_message = message;
- ptrace_notify((event << 8) | SIGTRAP);
- return true;
+ if (unlikely(ptrace_event_enabled(current, event))) {
+ current->ptrace_message = message;
+ ptrace_notify((event << 8) | SIGTRAP);
+ } else if (event == PTRACE_EVENT_EXEC && unlikely(current->ptrace)) {
+ /* legacy EXEC report via SIGTRAP */
+ send_sig(SIGTRAP, current, 0);
+ }
}
/**