The patch titled
ptrace-simplify-ptrace_exit-ignoring_children-pathpatch fix
has been removed from the -mm tree. Its filename was
ptrace-simplify-ptrace_exit-ignoring_children-pathpatch-fix.patch
This patch was dropped because it was folded into ptrace-simplify-ptrace_exit-ignoring_children-path.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ptrace-simplify-ptrace_exit-ignoring_children-pathpatch fix
From: Oleg Nesterov <oleg@xxxxxxxxxx>
Somehow I didn't even try to think about false _negative_, and it is
possible without ->siglock.
If we race with sigaction() which changes ->action[SIGCHLD]
from: { .sa_handler = SIG_IGN, .sa_flags = 0 }
to: { .sa_handler = handler, .sa_flags = SA_NOCLDWAIT }
we can read the stores out of order, and ignoring_children() may
return the wrong "false". Nothing really bad can happen, and the
race is mostly theoretical, but still this is not right.
[PATCH 2/4] ptrace: simplify ptrace_exit()->ignoring_children() path
In order to avoid the unnecessary ignoring_children() calls, ptrace_exit()
uses "int ign" to cache the returned value.
This makes sense because ptrace_exit() works with the list of tracees, but
the next patche changes this code to work with individual threads.
Remove this optimization, I don't think it is common to exit with a lot of
attached EXIT_ZOMBIE tracees. And this makes the code a bit simpler.
Also remove _irqsave/_irqrestore, this code always runs with irqs disabled.
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Jerome Marchand <jmarchan@xxxxxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/exit.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff -puN kernel/exit.c~ptrace-simplify-ptrace_exit-ignoring_children-pathpatch-fix kernel/exit.c
--- a/kernel/exit.c~ptrace-simplify-ptrace_exit-ignoring_children-pathpatch-fix
+++ a/kernel/exit.c
@@ -729,12 +729,16 @@ static void exit_mm(struct task_struct *
}
/*
- * Return nonzero if childs should reap themselves.
+ * Called with irqs disabled, returns true if childs should reap themselves.
*/
static int ignoring_children(struct sighand_struct *sigh)
{
- return sigh->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
- sigh->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT;
+ int ret;
+ spin_lock(&sigh->siglock);
+ ret = (sigh->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) ||
+ (sigh->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT);
+ spin_unlock(&sigh->siglock);
+ return ret;
}
/*
_
Patches currently in -mm which might be from oleg@xxxxxxxxxx are
origin.patch
do_wait-fix-waiting-for-the-group-stop-with-the-dead-leader.patch
signals-remove-handler-parameter-to-tracehook-functions.patch
signals-protect-init-from-unwanted-signals-more.patch
ptrace-kill-__ptrace_detach-fix-exit_state-check.patch
ptrace-simplify-ptrace_exit-ignoring_children-path.patch
ptrace-simplify-ptrace_exit-ignoring_children-pathpatch-fix.patch
ptrace-reintroduce-__ptrace_detach-as-a-callee-of-ptrace_exit.patch
ptrace-reintroduce-__ptrace_detach-as-a-callee-of-ptrace_exit-fix.patch
ptrace-fix-possible-zombie-leak-on-ptrace_detach.patch
reparent_thread-dont-call-kill_orphaned_pgrp-if-task_detached.patch
reparent_thread-fix-the-is-it-traced-check.patch
reparent_thread-fix-a-zombie-leak-if-sbin-init-ignores-sigchld.patch
forget_original_parent-split-out-the-un-ptrace-part.patch
forget_original_parent-do-not-abuse-child-ptrace_entry.patch
forget_original_parent-do-not-abuse-child-ptrace_entry-fix.patch
tracehook_notify_death-use-task_detached-helper.patch
ptrace_detach-the-wrong-wakeup-breaks-the-erestartxxx-logic.patch
ptrace_untrace-fix-the-signal_stop_stopped-check.patch
workqueue-avoid-recursion-in-run_workqueue.patch
pids-document-task_pgrp-task_session-is-not-safe-without-tasklist-rcu.patch
pids-improve-get_task_pid-to-fix-the-unsafe-sys_wait4-task_pgrp.patch
pids-refactor-vnr-nr_ns-helpers-to-make-them-safe.patch
pids-kill-now-unused-signal_struct-__pgrp-__session-and-friends.patch
linux-next.patch
getrusage-fill-ru_maxrss-value.patch
signals-split-do_tkill.patch
signals-implement-sys_rt_tgsigqueueinfo.patch
x86-hookup-sys_rt_tgsigqueueinfo.patch
signals-tracehook_notify_jctl-change.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
