diff options
author | Oleg Nesterov <oleg@redhat.com> | 2011-07-08 13:13:54 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2011-07-17 14:23:51 -0400 |
commit | dcace06cc29df927a74a6bc0e57b9bef87704377 (patch) | |
tree | 9a04518032869b1ed79933026379ea0d7081e43a /kernel | |
parent | 6634ae1033ceaeca5877dd75723210f8c2648c17 (diff) |
ptrace: mv send-SIGSTOP from do_fork() to ptrace_init_task()
If the new child is traced, do_fork() adds the pending SIGSTOP.
It assumes that either it is traced because of auto-attach or the
tracer attached later, in both cases sigaddset/set_thread_flag is
correct even if SIGSTOP is already pending.
Now that we have PTRACE_SEIZE this is no longer right in the latter
case. If the tracer does PTRACE_SEIZE after copy_process() makes the
child visible the queued SIGSTOP is wrong.
We could check PT_SEIZED bit and change ptrace_attach() to set both
PT_PTRACED and PT_SEIZED bits simultaneously but see the next patch,
we need to know whether this child was auto-attached or not anyway.
So this patch simply moves this code to ptrace_init_task(), this
way we can never race with ptrace_attach().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/fork.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 3c72a5b321a7..4d4117e01504 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/swap.h> | 37 | #include <linux/swap.h> |
38 | #include <linux/syscalls.h> | 38 | #include <linux/syscalls.h> |
39 | #include <linux/jiffies.h> | 39 | #include <linux/jiffies.h> |
40 | #include <linux/tracehook.h> | ||
41 | #include <linux/futex.h> | 40 | #include <linux/futex.h> |
42 | #include <linux/compat.h> | 41 | #include <linux/compat.h> |
43 | #include <linux/kthread.h> | 42 | #include <linux/kthread.h> |
@@ -1522,17 +1521,6 @@ long do_fork(unsigned long clone_flags, | |||
1522 | audit_finish_fork(p); | 1521 | audit_finish_fork(p); |
1523 | 1522 | ||
1524 | /* | 1523 | /* |
1525 | * Child is ready but hasn't started running yet. Queue | ||
1526 | * SIGSTOP if it's gonna be ptraced - it doesn't matter who | ||
1527 | * attached/attaching to this task, the pending SIGSTOP is | ||
1528 | * right in any case. | ||
1529 | */ | ||
1530 | if (unlikely(p->ptrace)) { | ||
1531 | sigaddset(&p->pending.signal, SIGSTOP); | ||
1532 | set_tsk_thread_flag(p, TIF_SIGPENDING); | ||
1533 | } | ||
1534 | |||
1535 | /* | ||
1536 | * We set PF_STARTING at creation in case tracing wants to | 1524 | * We set PF_STARTING at creation in case tracing wants to |
1537 | * use this to distinguish a fully live task from one that | 1525 | * use this to distinguish a fully live task from one that |
1538 | * hasn't finished SIGSTOP raising yet. Now we clear it | 1526 | * hasn't finished SIGSTOP raising yet. Now we clear it |