dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Tejun Heo 2011-06-17 16:50:36 +02:00 committed by Oleg Nesterov
parent 643ad8388e
commit f3c04b934d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/ptrace.h
View File

@ -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);
}
}
/**

4
include/linux/tracehook.h
View File

@ -201,9 +201,7 @@ static inline void tracehook_report_exec(struct linux_binfmt *fmt,
struct linux_binprm *bprm,
struct pt_regs *regs)
{
if (!ptrace_event(PTRACE_EVENT_EXEC, 0) &&
unlikely(current->ptrace & PT_PTRACED))
send_sig(SIGTRAP, current, 0);
ptrace_event(PTRACE_EVENT_EXEC, 0);
}
/**