Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-14 08:56:31 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-14 08:56:31 -0800
commit14b5caf92877316bd6c3a70caa466b6361b61bbb (patch)
tree197cfa7322b3af2de8a93b1815183eed02dc70c3
parent808235d0de2eeb0e3dea6fe4209c50c6589aff05 (diff)
x86: only single-step into signal handlers if the tracer
asked for it.
-rw-r--r--arch/i386/kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index a92cbc9fbe88..5e222f0315a8 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -413,7 +413,7 @@ static void setup_frame(int sig, struct k_sigaction *ka,
regs->xss = __USER_DS;
regs->xcs = __USER_CS;
if (regs->eflags & TF_MASK) {
- if (current->ptrace & PT_PTRACED) {
+ if ((current->ptrace & (PT_PTRACED | PT_DTRACE)) == (PT_PTRACED | PT_DTRACE)) {
ptrace_notify(SIGTRAP);
} else {
regs->eflags &= ~TF_MASK;