Commit 24728448 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

Kill some obsolete sub-thread-ptrace stuff

There is a couple of subtle checks which were needed to handle ptracing from
the same thread group. This was deprecated a long ago, imho this code just
complicates the understanding.

And, the "->parent->signal->flags & SIGNAL_GROUP_EXIT" check in exit_notify()
is not right. SIGNAL_GROUP_EXIT can mean exec(), not exit_group(). This means
ptracer can lose a ptraced zombie on exec(). Minor problem, but still the bug.
Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b6b1d877
...@@ -826,9 +826,7 @@ static void exit_notify(struct task_struct *tsk) ...@@ -826,9 +826,7 @@ static void exit_notify(struct task_struct *tsk)
* If our self_exec id doesn't match our parent_exec_id then * If our self_exec id doesn't match our parent_exec_id then
* we have changed execution domain as these two values started * we have changed execution domain as these two values started
* the same after a fork. * the same after a fork.
*
*/ */
if (tsk->exit_signal != SIGCHLD && tsk->exit_signal != -1 && if (tsk->exit_signal != SIGCHLD && tsk->exit_signal != -1 &&
( tsk->parent_exec_id != t->self_exec_id || ( tsk->parent_exec_id != t->self_exec_id ||
tsk->self_exec_id != tsk->parent_exec_id) tsk->self_exec_id != tsk->parent_exec_id)
...@@ -848,9 +846,7 @@ static void exit_notify(struct task_struct *tsk) ...@@ -848,9 +846,7 @@ static void exit_notify(struct task_struct *tsk)
} }
state = EXIT_ZOMBIE; state = EXIT_ZOMBIE;
if (tsk->exit_signal == -1 && if (tsk->exit_signal == -1 && likely(!tsk->ptrace))
(likely(tsk->ptrace == 0) ||
unlikely(tsk->parent->signal->flags & SIGNAL_GROUP_EXIT)))
state = EXIT_DEAD; state = EXIT_DEAD;
tsk->exit_state = state; tsk->exit_state = state;
......
...@@ -1561,10 +1561,6 @@ static inline int may_ptrace_stop(void) ...@@ -1561,10 +1561,6 @@ static inline int may_ptrace_stop(void)
(current->ptrace & PT_ATTACHED))) (current->ptrace & PT_ATTACHED)))
return 0; return 0;
if (unlikely(current->signal == current->parent->signal) &&
unlikely(current->signal->flags & SIGNAL_GROUP_EXIT))
return 0;
/* /*
* Are we in the middle of do_coredump? * Are we in the middle of do_coredump?
* If so and our tracer is also part of the coredump stopping * If so and our tracer is also part of the coredump stopping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment