diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-02-08 07:18:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:26 -0500 |
commit | 6b39c7bfbd1436836c0fb34c5b437fda1a7a3dd4 (patch) | |
tree | 60d3d9719eef3076527fcbf9c3cb362fe0f52d61 /kernel/signal.c | |
parent | 01b8b07a5d77d22e609267dcae74d15e3e9c5f13 (diff) |
kill PT_ATTACHED
Since the patch
"Fix ptrace_attach()/ptrace_traceme()/de_thread() race"
commit f5b40e363ad6041a96e3da32281d8faa191597b9
we set PT_ATTACHED and change child->parent "atomically" wrt task_list lock.
This means we can remove the checks like "PT_ATTACHED && ->parent != ptracer"
which were needed to catch the "ptrace attach is in progress" case. We can
also remove the flag itself since nobody else uses it.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 5d30ff561847..6d6d1ab39e7e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1556,11 +1556,6 @@ static inline int may_ptrace_stop(void) | |||
1556 | { | 1556 | { |
1557 | if (!likely(current->ptrace & PT_PTRACED)) | 1557 | if (!likely(current->ptrace & PT_PTRACED)) |
1558 | return 0; | 1558 | return 0; |
1559 | |||
1560 | if (unlikely(current->parent == current->real_parent && | ||
1561 | (current->ptrace & PT_ATTACHED))) | ||
1562 | return 0; | ||
1563 | |||
1564 | /* | 1559 | /* |
1565 | * Are we in the middle of do_coredump? | 1560 | * Are we in the middle of do_coredump? |
1566 | * If so and our tracer is also part of the coredump stopping | 1561 | * If so and our tracer is also part of the coredump stopping |