The patch titled
kill my_ptrace_child()
has been removed from the -mm tree. Its filename was
kill-my_ptrace_child.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: kill my_ptrace_child()
From: Oleg Nesterov <oleg@xxxxxxxxxx>
Now that my_ptrace_child() is trivial we can use the "p->ptrace & PT_PTRACED"
inline and simplify the corresponding logic in do_wait: we can't find the child
in TASK_TRACED state without PT_PTRACED flag set, ptrace_untrace() either sets
TASK_STOPPED or wakes up the tracee.
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/exit.c | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff -puN kernel/exit.c~kill-my_ptrace_child kernel/exit.c
--- a/kernel/exit.c~kill-my_ptrace_child
+++ a/kernel/exit.c
@@ -1512,12 +1512,6 @@ static int wait_task_continued(struct ta
return retval;
}
-
-static inline int my_ptrace_child(struct task_struct *p)
-{
- return p->ptrace & PT_PTRACED;
-}
-
static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
int __user *stat_addr, struct rusage __user *ru)
{
@@ -1556,22 +1550,11 @@ repeat:
/*
* It's stopped now, so it might later
* continue, exit, or stop again.
- *
- * When we hit the race with PTRACE_ATTACH, we
- * will not report this child. But the race
- * means it has not yet been moved to our
- * ptrace_children list, so we need to set the
- * flag here to avoid a spurious ECHILD when
- * the race happens with the only child.
*/
flag = 1;
-
- if (!my_ptrace_child(p)) {
- if (is_task_traced(p))
- continue;
- if (!(options & WUNTRACED))
- continue;
- }
+ if (!(p->ptrace & PT_PTRACED) &&
+ !(options & WUNTRACED))
+ continue;
retval = wait_task_stopped(p, ret == 2,
(options & WNOWAIT), infop,
_
Patches currently in -mm which might be from oleg@xxxxxxxxxx are
wait_task_stopped-dont-use-task_pid_nr_ns-lockless.patch
proc-remove-races-from-proc_id_readdir.patch
wait_task_stopped-pass-correct-exit_code-to.patch
use-__set_task_state-for-traced-stopped-tasks.patch
add-task_wakekill.patch
kill-my_ptrace_child.patch
do_wait-remove-one-else-if-branch.patch
proc-implement-proc_single_file_operations.patch
proc-rewrite-do_task_stat-to-correctly-handle-pid-namespaces.patch
proc-seqfile-convert-proc_pid_statm.patch
proc-proper-pidns-handling-for-proc-self.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
