2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* linux/kernel/exit.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/module.h>
|
2006-01-11 15:17:46 -05:00
|
|
|
#include <linux/capability.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/completion.h>
|
|
|
|
#include <linux/personality.h>
|
|
|
|
#include <linux/tty.h>
|
2006-12-08 05:37:56 -05:00
|
|
|
#include <linux/mnt_namespace.h>
|
2008-06-30 14:42:08 -04:00
|
|
|
#include <linux/iocontext.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/key.h>
|
|
|
|
#include <linux/security.h>
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/acct.h>
|
2006-10-01 02:28:59 -04:00
|
|
|
#include <linux/tsacct_kern.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/file.h>
|
2008-04-24 07:44:08 -04:00
|
|
|
#include <linux/fdtable.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/binfmts.h>
|
2006-10-02 05:18:06 -04:00
|
|
|
#include <linux/nsproxy.h>
|
2006-12-08 05:38:01 -05:00
|
|
|
#include <linux/pid_namespace.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/ptrace.h>
|
|
|
|
#include <linux/profile.h>
|
|
|
|
#include <linux/mount.h>
|
|
|
|
#include <linux/proc_fs.h>
|
2007-05-09 05:34:33 -04:00
|
|
|
#include <linux/kthread.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/mempolicy.h>
|
2006-07-14 03:24:40 -04:00
|
|
|
#include <linux/taskstats_kern.h>
|
2006-07-14 03:24:36 -04:00
|
|
|
#include <linux/delayacct.h>
|
2007-07-17 07:03:35 -04:00
|
|
|
#include <linux/freezer.h>
|
2007-10-19 02:39:33 -04:00
|
|
|
#include <linux/cgroup.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/syscalls.h>
|
2005-05-01 11:59:14 -04:00
|
|
|
#include <linux/signal.h>
|
2006-03-28 19:11:18 -05:00
|
|
|
#include <linux/posix-timers.h>
|
2005-11-07 03:59:16 -05:00
|
|
|
#include <linux/cn_proc.h>
|
2006-01-09 18:59:21 -05:00
|
|
|
#include <linux/mutex.h>
|
2006-03-27 04:16:22 -05:00
|
|
|
#include <linux/futex.h>
|
2006-03-27 04:16:24 -05:00
|
|
|
#include <linux/compat.h>
|
2006-04-11 07:52:07 -04:00
|
|
|
#include <linux/pipe_fs_i.h>
|
2006-03-29 20:30:19 -05:00
|
|
|
#include <linux/audit.h> /* for audit_free() */
|
2006-06-25 08:47:41 -04:00
|
|
|
#include <linux/resource.h>
|
2006-08-29 14:05:56 -04:00
|
|
|
#include <linux/blkdev.h>
|
2007-05-11 01:22:37 -04:00
|
|
|
#include <linux/task_io_accounting_ops.h>
|
2008-07-25 22:45:46 -04:00
|
|
|
#include <linux/tracehook.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/unistd.h>
|
|
|
|
#include <asm/pgtable.h>
|
|
|
|
#include <asm/mmu_context.h>
|
|
|
|
|
2005-05-01 11:59:29 -04:00
|
|
|
static void exit_mm(struct task_struct * tsk);
|
|
|
|
|
2008-04-30 03:53:11 -04:00
|
|
|
static inline int task_detached(struct task_struct *p)
|
|
|
|
{
|
|
|
|
return p->exit_signal == -1;
|
|
|
|
}
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
static void __unhash_process(struct task_struct *p)
|
|
|
|
{
|
|
|
|
nr_threads--;
|
|
|
|
detach_pid(p, PIDTYPE_PID);
|
|
|
|
if (thread_group_leader(p)) {
|
|
|
|
detach_pid(p, PIDTYPE_PGID);
|
|
|
|
detach_pid(p, PIDTYPE_SID);
|
2006-03-28 19:11:06 -05:00
|
|
|
|
2006-04-19 01:20:16 -04:00
|
|
|
list_del_rcu(&p->tasks);
|
2006-03-28 19:11:07 -05:00
|
|
|
__get_cpu_var(process_counts)--;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
2006-03-28 19:11:25 -05:00
|
|
|
list_del_rcu(&p->thread_group);
|
2008-03-24 21:36:23 -04:00
|
|
|
list_del_init(&p->sibling);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2006-03-28 19:11:18 -05:00
|
|
|
/*
|
|
|
|
* This function expects the tasklist_lock write-locked.
|
|
|
|
*/
|
|
|
|
static void __exit_signal(struct task_struct *tsk)
|
|
|
|
{
|
|
|
|
struct signal_struct *sig = tsk->signal;
|
|
|
|
struct sighand_struct *sighand;
|
|
|
|
|
|
|
|
BUG_ON(!sig);
|
|
|
|
BUG_ON(!atomic_read(&sig->count));
|
|
|
|
|
|
|
|
sighand = rcu_dereference(tsk->sighand);
|
|
|
|
spin_lock(&sighand->siglock);
|
|
|
|
|
|
|
|
posix_cpu_timers_exit(tsk);
|
|
|
|
if (atomic_dec_and_test(&sig->count))
|
|
|
|
posix_cpu_timers_exit_group(tsk);
|
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* If there is any task waiting for the group exit
|
|
|
|
* then notify it:
|
|
|
|
*/
|
2007-10-17 02:27:23 -04:00
|
|
|
if (sig->group_exit_task && atomic_read(&sig->count) == sig->notify_count)
|
2006-03-28 19:11:18 -05:00
|
|
|
wake_up_process(sig->group_exit_task);
|
2007-10-17 02:27:23 -04:00
|
|
|
|
2006-03-28 19:11:18 -05:00
|
|
|
if (tsk == sig->curr_target)
|
|
|
|
sig->curr_target = next_thread(tsk);
|
|
|
|
/*
|
|
|
|
* Accumulate here the counters for all threads but the
|
|
|
|
* group leader as they die, so they can be added into
|
|
|
|
* the process-wide totals when those are taken.
|
|
|
|
* The group leader stays around as a zombie as long
|
|
|
|
* as there are other threads. When it gets reaped,
|
|
|
|
* the exit.c code will add its counts into these totals.
|
|
|
|
* We won't ever get here for the group leader, since it
|
|
|
|
* will have been the last reference on the signal_struct.
|
|
|
|
*/
|
|
|
|
sig->utime = cputime_add(sig->utime, tsk->utime);
|
|
|
|
sig->stime = cputime_add(sig->stime, tsk->stime);
|
2007-10-15 11:00:19 -04:00
|
|
|
sig->gtime = cputime_add(sig->gtime, tsk->gtime);
|
2006-03-28 19:11:18 -05:00
|
|
|
sig->min_flt += tsk->min_flt;
|
|
|
|
sig->maj_flt += tsk->maj_flt;
|
|
|
|
sig->nvcsw += tsk->nvcsw;
|
|
|
|
sig->nivcsw += tsk->nivcsw;
|
2007-05-11 01:22:37 -04:00
|
|
|
sig->inblock += task_io_get_inblock(tsk);
|
|
|
|
sig->oublock += task_io_get_oublock(tsk);
|
2008-07-27 11:29:15 -04:00
|
|
|
task_io_accounting_add(&sig->ioac, &tsk->ioac);
|
2007-07-09 12:52:00 -04:00
|
|
|
sig->sum_sched_runtime += tsk->se.sum_exec_runtime;
|
2006-03-28 19:11:18 -05:00
|
|
|
sig = NULL; /* Marker for below. */
|
|
|
|
}
|
|
|
|
|
2006-03-28 19:11:20 -05:00
|
|
|
__unhash_process(tsk);
|
|
|
|
|
2008-05-23 16:04:41 -04:00
|
|
|
/*
|
|
|
|
* Do this under ->siglock, we can race with another thread
|
|
|
|
* doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
|
|
|
|
*/
|
|
|
|
flush_sigqueue(&tsk->pending);
|
|
|
|
|
2006-03-28 19:11:18 -05:00
|
|
|
tsk->signal = NULL;
|
2006-03-28 19:11:27 -05:00
|
|
|
tsk->sighand = NULL;
|
2006-03-28 19:11:18 -05:00
|
|
|
spin_unlock(&sighand->siglock);
|
|
|
|
|
2006-03-28 19:11:27 -05:00
|
|
|
__cleanup_sighand(sighand);
|
2006-03-28 19:11:18 -05:00
|
|
|
clear_tsk_thread_flag(tsk,TIF_SIGPENDING);
|
|
|
|
if (sig) {
|
|
|
|
flush_sigqueue(&sig->shared_pending);
|
2006-10-28 13:38:51 -04:00
|
|
|
taskstats_tgid_free(sig);
|
2006-03-28 19:11:18 -05:00
|
|
|
__cleanup_signal(sig);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-31 05:31:37 -05:00
|
|
|
static void delayed_put_task_struct(struct rcu_head *rhp)
|
|
|
|
{
|
|
|
|
put_task_struct(container_of(rhp, struct task_struct, rcu));
|
|
|
|
}
|
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
void release_task(struct task_struct * p)
|
|
|
|
{
|
2006-07-03 03:25:41 -04:00
|
|
|
struct task_struct *leader;
|
2005-04-16 18:20:36 -04:00
|
|
|
int zap_leader;
|
2006-03-28 19:11:11 -05:00
|
|
|
repeat:
|
2008-07-25 22:45:48 -04:00
|
|
|
tracehook_prepare_release_task(p);
|
2005-04-16 18:20:36 -04:00
|
|
|
atomic_dec(&p->user->processes);
|
2007-10-19 02:40:03 -04:00
|
|
|
proc_flush_task(p);
|
2005-04-16 18:20:36 -04:00
|
|
|
write_lock_irq(&tasklist_lock);
|
2008-07-25 22:45:48 -04:00
|
|
|
tracehook_finish_release_task(p);
|
2005-04-16 18:20:36 -04:00
|
|
|
__exit_signal(p);
|
2006-03-28 19:11:19 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* If we are the last non-leader member of the thread
|
|
|
|
* group, and the leader is zombie, then notify the
|
|
|
|
* group leader's parent process. (if it wants notification.)
|
|
|
|
*/
|
|
|
|
zap_leader = 0;
|
|
|
|
leader = p->group_leader;
|
|
|
|
if (leader != p && thread_group_empty(leader) && leader->exit_state == EXIT_ZOMBIE) {
|
2008-04-30 03:53:11 -04:00
|
|
|
BUG_ON(task_detached(leader));
|
2005-04-16 18:20:36 -04:00
|
|
|
do_notify_parent(leader, leader->exit_signal);
|
|
|
|
/*
|
|
|
|
* If we were the last child thread and the leader has
|
|
|
|
* exited already, and the leader's parent ignores SIGCHLD,
|
|
|
|
* then we are the one who should release the leader.
|
|
|
|
*
|
|
|
|
* do_notify_parent() will have marked it self-reaping in
|
|
|
|
* that case.
|
|
|
|
*/
|
2008-04-30 03:53:11 -04:00
|
|
|
zap_leader = task_detached(leader);
|
2008-07-25 22:45:48 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This maintains the invariant that release_task()
|
|
|
|
* only runs on a task in EXIT_DEAD, just for sanity.
|
|
|
|
*/
|
|
|
|
if (zap_leader)
|
|
|
|
leader->exit_state = EXIT_DEAD;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
write_unlock_irq(&tasklist_lock);
|
|
|
|
release_thread(p);
|
2006-03-31 05:31:37 -05:00
|
|
|
call_rcu(&p->rcu, delayed_put_task_struct);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
p = leader;
|
|
|
|
if (unlikely(zap_leader))
|
|
|
|
goto repeat;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This checks not only the pgrp, but falls back on the pid if no
|
|
|
|
* satisfactory pgrp is found. I dunno - gdb doesn't work correctly
|
|
|
|
* without this...
|
2007-02-12 03:52:56 -05:00
|
|
|
*
|
|
|
|
* The caller must hold rcu lock or the tasklist lock.
|
2005-04-16 18:20:36 -04:00
|
|
|
*/
|
2007-02-12 03:52:56 -05:00
|
|
|
struct pid *session_of_pgrp(struct pid *pgrp)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct task_struct *p;
|
2007-02-12 03:52:56 -05:00
|
|
|
struct pid *sid = NULL;
|
2006-12-08 05:38:03 -05:00
|
|
|
|
2007-02-12 03:52:56 -05:00
|
|
|
p = pid_task(pgrp, PIDTYPE_PGID);
|
2006-12-08 05:38:03 -05:00
|
|
|
if (p == NULL)
|
2007-02-12 03:52:56 -05:00
|
|
|
p = pid_task(pgrp, PIDTYPE_PID);
|
2006-12-08 05:38:03 -05:00
|
|
|
if (p != NULL)
|
2007-02-12 03:52:56 -05:00
|
|
|
sid = task_session(p);
|
2006-12-08 05:38:03 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
return sid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine if a process group is "orphaned", according to the POSIX
|
|
|
|
* definition in 2.2.2.52. Orphaned process groups are not to be affected
|
|
|
|
* by terminal-generated stop signals. Newly orphaned process groups are
|
|
|
|
* to receive a SIGHUP and a SIGCONT.
|
|
|
|
*
|
|
|
|
* "I ask you, have you ever known what it is to be an orphan?"
|
|
|
|
*/
|
2007-02-12 03:52:57 -05:00
|
|
|
static int will_become_orphaned_pgrp(struct pid *pgrp, struct task_struct *ignored_task)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct task_struct *p;
|
|
|
|
|
2007-02-12 03:52:57 -05:00
|
|
|
do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
|
2008-03-02 13:44:42 -05:00
|
|
|
if ((p == ignored_task) ||
|
|
|
|
(p->exit_state && thread_group_empty(p)) ||
|
|
|
|
is_global_init(p->real_parent))
|
2005-04-16 18:20:36 -04:00
|
|
|
continue;
|
2008-03-02 13:44:42 -05:00
|
|
|
|
2007-02-12 03:52:57 -05:00
|
|
|
if (task_pgrp(p->real_parent) != pgrp &&
|
2008-03-02 13:44:42 -05:00
|
|
|
task_session(p->real_parent) == task_session(p))
|
|
|
|
return 0;
|
2007-02-12 03:52:57 -05:00
|
|
|
} while_each_pid_task(pgrp, PIDTYPE_PGID, p);
|
2008-03-02 13:44:42 -05:00
|
|
|
|
|
|
|
return 1;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2007-02-12 03:52:58 -05:00
|
|
|
int is_current_pgrp_orphaned(void)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
2007-02-12 03:52:58 -05:00
|
|
|
retval = will_become_orphaned_pgrp(task_pgrp(current), NULL);
|
2005-04-16 18:20:36 -04:00
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2007-02-12 03:52:57 -05:00
|
|
|
static int has_stopped_jobs(struct pid *pgrp)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
int retval = 0;
|
|
|
|
struct task_struct *p;
|
|
|
|
|
2007-02-12 03:52:57 -05:00
|
|
|
do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
|
2007-12-06 11:09:35 -05:00
|
|
|
if (!task_is_stopped(p))
|
2005-04-16 18:20:36 -04:00
|
|
|
continue;
|
|
|
|
retval = 1;
|
|
|
|
break;
|
2007-02-12 03:52:57 -05:00
|
|
|
} while_each_pid_task(pgrp, PIDTYPE_PGID, p);
|
2005-04-16 18:20:36 -04:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2008-03-02 13:44:40 -05:00
|
|
|
/*
|
|
|
|
* Check to see if any process groups have become orphaned as
|
|
|
|
* a result of our exiting, and if they have any stopped jobs,
|
|
|
|
* send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2)
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
kill_orphaned_pgrp(struct task_struct *tsk, struct task_struct *parent)
|
|
|
|
{
|
|
|
|
struct pid *pgrp = task_pgrp(tsk);
|
|
|
|
struct task_struct *ignored_task = tsk;
|
|
|
|
|
|
|
|
if (!parent)
|
|
|
|
/* exit: our father is in a different pgrp than
|
|
|
|
* we are and we were the only connection outside.
|
|
|
|
*/
|
|
|
|
parent = tsk->real_parent;
|
|
|
|
else
|
|
|
|
/* reparent: our child is in a different pgrp than
|
|
|
|
* we are, and it was the only connection outside.
|
|
|
|
*/
|
|
|
|
ignored_task = NULL;
|
|
|
|
|
|
|
|
if (task_pgrp(parent) != pgrp &&
|
|
|
|
task_session(parent) == task_session(tsk) &&
|
|
|
|
will_become_orphaned_pgrp(pgrp, ignored_task) &&
|
|
|
|
has_stopped_jobs(pgrp)) {
|
|
|
|
__kill_pgrp_info(SIGHUP, SEND_SIG_PRIV, pgrp);
|
|
|
|
__kill_pgrp_info(SIGCONT, SEND_SIG_PRIV, pgrp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/**
|
2007-05-09 05:34:33 -04:00
|
|
|
* reparent_to_kthreadd - Reparent the calling kernel thread to kthreadd
|
2005-04-16 18:20:36 -04:00
|
|
|
*
|
|
|
|
* If a kernel thread is launched as a result of a system call, or if
|
2007-05-09 05:34:33 -04:00
|
|
|
* it ever exits, it should generally reparent itself to kthreadd so it
|
|
|
|
* isn't in the way of other processes and is correctly cleaned up on exit.
|
2005-04-16 18:20:36 -04:00
|
|
|
*
|
|
|
|
* The various task state such as scheduling policy and priority may have
|
|
|
|
* been inherited from a user process, so we reset them to sane values here.
|
|
|
|
*
|
2007-05-09 05:34:33 -04:00
|
|
|
* NOTE that reparent_to_kthreadd() gives the caller full capabilities.
|
2005-04-16 18:20:36 -04:00
|
|
|
*/
|
2007-05-09 05:34:33 -04:00
|
|
|
static void reparent_to_kthreadd(void)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
write_lock_irq(&tasklist_lock);
|
|
|
|
|
|
|
|
ptrace_unlink(current);
|
|
|
|
/* Reparent to init */
|
2007-05-09 05:34:33 -04:00
|
|
|
current->real_parent = current->parent = kthreadd_task;
|
2008-03-24 21:36:23 -04:00
|
|
|
list_move_tail(¤t->sibling, ¤t->real_parent->children);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* Set the exit signal to SIGCHLD so we signal init on exit */
|
|
|
|
current->exit_signal = SIGCHLD;
|
|
|
|
|
2007-07-09 12:51:59 -04:00
|
|
|
if (task_nice(current) < 0)
|
2005-04-16 18:20:36 -04:00
|
|
|
set_user_nice(current, 0);
|
|
|
|
/* cpus_allowed? */
|
|
|
|
/* rt_priority? */
|
|
|
|
/* signals? */
|
|
|
|
security_task_reparent_to_init(current);
|
|
|
|
memcpy(current->signal->rlim, init_task.signal->rlim,
|
|
|
|
sizeof(current->signal->rlim));
|
|
|
|
atomic_inc(&(INIT_USER->__count));
|
|
|
|
write_unlock_irq(&tasklist_lock);
|
|
|
|
switch_uid(INIT_USER);
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:09 -05:00
|
|
|
void __set_special_pids(struct pid *pid)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2006-01-08 04:03:58 -05:00
|
|
|
struct task_struct *curr = current->group_leader;
|
2008-02-08 07:19:09 -05:00
|
|
|
pid_t nr = pid_nr(pid);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-02-08 07:19:09 -05:00
|
|
|
if (task_session(curr) != pid) {
|
2008-04-30 03:54:27 -04:00
|
|
|
change_pid(curr, PIDTYPE_SID, pid);
|
2008-02-08 07:19:09 -05:00
|
|
|
set_task_session(curr, nr);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
2008-02-08 07:19:09 -05:00
|
|
|
if (task_pgrp(curr) != pid) {
|
2008-04-30 03:54:27 -04:00
|
|
|
change_pid(curr, PIDTYPE_PGID, pid);
|
2008-02-08 07:19:09 -05:00
|
|
|
set_task_pgrp(curr, nr);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:09 -05:00
|
|
|
static void set_special_pids(struct pid *pid)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
write_lock_irq(&tasklist_lock);
|
2008-02-08 07:19:09 -05:00
|
|
|
__set_special_pids(pid);
|
2005-04-16 18:20:36 -04:00
|
|
|
write_unlock_irq(&tasklist_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Let kernel threads use this to say that they
|
|
|
|
* allow a certain signal (since daemonize() will
|
|
|
|
* have disabled all of them by default).
|
|
|
|
*/
|
|
|
|
int allow_signal(int sig)
|
|
|
|
{
|
2005-05-01 11:59:14 -04:00
|
|
|
if (!valid_signal(sig) || sig < 1)
|
2005-04-16 18:20:36 -04:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
|
|
|
sigdelset(¤t->blocked, sig);
|
|
|
|
if (!current->mm) {
|
|
|
|
/* Kernel threads handle their own signals.
|
|
|
|
Let the signal code know it'll be handled, so
|
|
|
|
that they don't get converted to SIGKILL or
|
|
|
|
just silently dropped */
|
|
|
|
current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
|
|
|
|
}
|
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(allow_signal);
|
|
|
|
|
|
|
|
int disallow_signal(int sig)
|
|
|
|
{
|
2005-05-01 11:59:14 -04:00
|
|
|
if (!valid_signal(sig) || sig < 1)
|
2005-04-16 18:20:36 -04:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
spin_lock_irq(¤t->sighand->siglock);
|
2007-05-09 05:34:37 -04:00
|
|
|
current->sighand->action[(sig)-1].sa.sa_handler = SIG_IGN;
|
2005-04-16 18:20:36 -04:00
|
|
|
recalc_sigpending();
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(disallow_signal);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Put all the gunge required to become a kernel thread without
|
|
|
|
* attached user resources in one place where it belongs.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void daemonize(const char *name, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
struct fs_struct *fs;
|
|
|
|
sigset_t blocked;
|
|
|
|
|
|
|
|
va_start(args, name);
|
|
|
|
vsnprintf(current->comm, sizeof(current->comm), name, args);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we were started as result of loading a module, close all of the
|
|
|
|
* user space pages. We don't need them, and if we didn't close them
|
|
|
|
* they would be locked into memory.
|
|
|
|
*/
|
|
|
|
exit_mm(current);
|
2007-07-17 07:03:35 -04:00
|
|
|
/*
|
|
|
|
* We don't want to have TIF_FREEZE set if the system-wide hibernation
|
|
|
|
* or suspend transition begins right now.
|
|
|
|
*/
|
2008-07-25 04:47:37 -04:00
|
|
|
current->flags |= (PF_NOFREEZE | PF_KTHREAD);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-02-08 07:19:09 -05:00
|
|
|
if (current->nsproxy != &init_nsproxy) {
|
|
|
|
get_nsproxy(&init_nsproxy);
|
|
|
|
switch_task_namespaces(current, &init_nsproxy);
|
|
|
|
}
|
2008-02-08 07:19:10 -05:00
|
|
|
set_special_pids(&init_struct_pid);
|
2006-12-08 05:36:04 -05:00
|
|
|
proc_clear_tty(current);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* Block and flush all signals */
|
|
|
|
sigfillset(&blocked);
|
|
|
|
sigprocmask(SIG_BLOCK, &blocked, NULL);
|
|
|
|
flush_signals(current);
|
|
|
|
|
|
|
|
/* Become as one with the init task */
|
|
|
|
|
|
|
|
exit_fs(current); /* current->fs->count--; */
|
|
|
|
fs = init_task.fs;
|
|
|
|
current->fs = fs;
|
|
|
|
atomic_inc(&fs->count);
|
2006-10-02 05:18:06 -04:00
|
|
|
|
2007-10-19 02:39:59 -04:00
|
|
|
exit_files(current);
|
2005-04-16 18:20:36 -04:00
|
|
|
current->files = init_task.files;
|
|
|
|
atomic_inc(¤t->files->count);
|
|
|
|
|
2007-05-09 05:34:33 -04:00
|
|
|
reparent_to_kthreadd();
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(daemonize);
|
|
|
|
|
2006-01-14 16:20:43 -05:00
|
|
|
static void close_files(struct files_struct * files)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
int i, j;
|
2005-09-09 16:04:10 -04:00
|
|
|
struct fdtable *fdt;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
j = 0;
|
2005-09-16 22:28:13 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* It is safe to dereference the fd table without RCU or
|
|
|
|
* ->file_lock because this is the last reference to the
|
|
|
|
* files structure.
|
|
|
|
*/
|
2005-09-09 16:04:10 -04:00
|
|
|
fdt = files_fdtable(files);
|
2005-04-16 18:20:36 -04:00
|
|
|
for (;;) {
|
|
|
|
unsigned long set;
|
|
|
|
i = j * __NFDBITS;
|
2006-12-10 05:21:12 -05:00
|
|
|
if (i >= fdt->max_fds)
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
2005-09-09 16:04:10 -04:00
|
|
|
set = fdt->open_fds->fds_bits[j++];
|
2005-04-16 18:20:36 -04:00
|
|
|
while (set) {
|
|
|
|
if (set & 1) {
|
2005-09-09 16:04:10 -04:00
|
|
|
struct file * file = xchg(&fdt->fd[i], NULL);
|
2007-02-12 03:52:26 -05:00
|
|
|
if (file) {
|
2005-04-16 18:20:36 -04:00
|
|
|
filp_close(file, files);
|
2007-02-12 03:52:26 -05:00
|
|
|
cond_resched();
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
i++;
|
|
|
|
set >>= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct files_struct *get_files_struct(struct task_struct *task)
|
|
|
|
{
|
|
|
|
struct files_struct *files;
|
|
|
|
|
|
|
|
task_lock(task);
|
|
|
|
files = task->files;
|
|
|
|
if (files)
|
|
|
|
atomic_inc(&files->count);
|
|
|
|
task_unlock(task);
|
|
|
|
|
|
|
|
return files;
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:53 -05:00
|
|
|
void put_files_struct(struct files_struct *files)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2005-09-09 16:04:10 -04:00
|
|
|
struct fdtable *fdt;
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
if (atomic_dec_and_test(&files->count)) {
|
|
|
|
close_files(files);
|
|
|
|
/*
|
|
|
|
* Free the fd and fdset arrays if we expanded them.
|
2005-09-09 16:04:13 -04:00
|
|
|
* If the fdtable was embedded, pass files for freeing
|
|
|
|
* at the end of the RCU grace period. Otherwise,
|
|
|
|
* you can free files immediately.
|
2005-04-16 18:20:36 -04:00
|
|
|
*/
|
2005-09-09 16:04:10 -04:00
|
|
|
fdt = files_fdtable(files);
|
2006-12-10 05:21:17 -05:00
|
|
|
if (fdt != &files->fdtab)
|
2005-09-09 16:04:13 -04:00
|
|
|
kmem_cache_free(files_cachep, files);
|
2006-12-22 04:10:43 -05:00
|
|
|
free_fdtable(fdt);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-22 05:31:30 -04:00
|
|
|
void reset_files_struct(struct files_struct *files)
|
2006-09-29 05:00:05 -04:00
|
|
|
{
|
2008-04-22 05:31:30 -04:00
|
|
|
struct task_struct *tsk = current;
|
2006-09-29 05:00:05 -04:00
|
|
|
struct files_struct *old;
|
|
|
|
|
|
|
|
old = tsk->files;
|
|
|
|
task_lock(tsk);
|
|
|
|
tsk->files = files;
|
|
|
|
task_unlock(tsk);
|
|
|
|
put_files_struct(old);
|
|
|
|
}
|
|
|
|
|
2008-04-22 05:35:42 -04:00
|
|
|
void exit_files(struct task_struct *tsk)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct files_struct * files = tsk->files;
|
|
|
|
|
|
|
|
if (files) {
|
|
|
|
task_lock(tsk);
|
|
|
|
tsk->files = NULL;
|
|
|
|
task_unlock(tsk);
|
|
|
|
put_files_struct(files);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-22 05:35:42 -04:00
|
|
|
void put_fs_struct(struct fs_struct *fs)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
/* No need to hold fs->lock if we are killing it */
|
|
|
|
if (atomic_dec_and_test(&fs->count)) {
|
2008-02-14 22:34:38 -05:00
|
|
|
path_put(&fs->root);
|
|
|
|
path_put(&fs->pwd);
|
2005-04-16 18:20:36 -04:00
|
|
|
kmem_cache_free(fs_cachep, fs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-22 05:35:42 -04:00
|
|
|
void exit_fs(struct task_struct *tsk)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct fs_struct * fs = tsk->fs;
|
|
|
|
|
|
|
|
if (fs) {
|
|
|
|
task_lock(tsk);
|
|
|
|
tsk->fs = NULL;
|
|
|
|
task_unlock(tsk);
|
2008-04-22 05:35:42 -04:00
|
|
|
put_fs_struct(fs);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(exit_fs);
|
|
|
|
|
cgroups: add an owner to the mm_struct
Remove the mem_cgroup member from mm_struct and instead adds an owner.
This approach was suggested by Paul Menage. The advantage of this approach
is that, once the mm->owner is known, using the subsystem id, the cgroup
can be determined. It also allows several control groups that are
virtually grouped by mm_struct, to exist independent of the memory
controller i.e., without adding mem_cgroup's for each controller, to
mm_struct.
A new config option CONFIG_MM_OWNER is added and the memory resource
controller selects this config option.
This patch also adds cgroup callbacks to notify subsystems when mm->owner
changes. The mm_cgroup_changed callback is called with the task_lock() of
the new task held and is called just prior to changing the mm->owner.
I am indebted to Paul Menage for the several reviews of this patchset and
helping me make it lighter and simpler.
This patch was tested on a powerpc box, it was compiled with both the
MM_OWNER config turned on and off.
After the thread group leader exits, it's moved to init_css_state by
cgroup_exit(), thus all future charges from runnings threads would be
redirected to the init_css_set's subsystem.
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Sudhir Kumar <skumar@linux.vnet.ibm.com>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Cc: Hirokazu Takahashi <taka@valinux.co.jp>
Cc: David Rientjes <rientjes@google.com>,
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Reviewed-by: Paul Menage <menage@google.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-04-29 04:00:16 -04:00
|
|
|
#ifdef CONFIG_MM_OWNER
|
|
|
|
/*
|
|
|
|
* Task p is exiting and it owned mm, lets find a new owner for it
|
|
|
|
*/
|
|
|
|
static inline int
|
|
|
|
mm_need_new_owner(struct mm_struct *mm, struct task_struct *p)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If there are other users of the mm and the owner (us) is exiting
|
|
|
|
* we need to find a new owner to take on the responsibility.
|
|
|
|
*/
|
|
|
|
if (!mm)
|
|
|
|
return 0;
|
|
|
|
if (atomic_read(&mm->mm_users) <= 1)
|
|
|
|
return 0;
|
|
|
|
if (mm->owner != p)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mm_update_next_owner(struct mm_struct *mm)
|
|
|
|
{
|
|
|
|
struct task_struct *c, *g, *p = current;
|
|
|
|
|
|
|
|
retry:
|
|
|
|
if (!mm_need_new_owner(mm, p))
|
|
|
|
return;
|
|
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
/*
|
|
|
|
* Search in the children
|
|
|
|
*/
|
|
|
|
list_for_each_entry(c, &p->children, sibling) {
|
|
|
|
if (c->mm == mm)
|
|
|
|
goto assign_new_owner;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Search in the siblings
|
|
|
|
*/
|
|
|
|
list_for_each_entry(c, &p->parent->children, sibling) {
|
|
|
|
if (c->mm == mm)
|
|
|
|
goto assign_new_owner;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Search through everything else. We should not get
|
|
|
|
* here often
|
|
|
|
*/
|
|
|
|
do_each_thread(g, c) {
|
|
|
|
if (c->mm == mm)
|
|
|
|
goto assign_new_owner;
|
|
|
|
} while_each_thread(g, c);
|
|
|
|
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
return;
|
|
|
|
|
|
|
|
assign_new_owner:
|
|
|
|
BUG_ON(c == p);
|
|
|
|
get_task_struct(c);
|
|
|
|
/*
|
|
|
|
* The task_lock protects c->mm from changing.
|
|
|
|
* We always want mm->owner->mm == mm
|
|
|
|
*/
|
|
|
|
task_lock(c);
|
|
|
|
/*
|
|
|
|
* Delay read_unlock() till we have the task_lock()
|
|
|
|
* to ensure that c does not slip away underneath us
|
|
|
|
*/
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
if (c->mm != mm) {
|
|
|
|
task_unlock(c);
|
|
|
|
put_task_struct(c);
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
cgroup_mm_owner_callbacks(mm->owner, c);
|
|
|
|
mm->owner = c;
|
|
|
|
task_unlock(c);
|
|
|
|
put_task_struct(c);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_MM_OWNER */
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* Turn us into a lazy TLB process if we
|
|
|
|
* aren't already..
|
|
|
|
*/
|
2005-05-01 11:59:29 -04:00
|
|
|
static void exit_mm(struct task_struct * tsk)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct mm_struct *mm = tsk->mm;
|
2008-07-25 04:47:44 -04:00
|
|
|
struct core_state *core_state;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
mm_release(tsk, mm);
|
|
|
|
if (!mm)
|
|
|
|
return;
|
|
|
|
/*
|
|
|
|
* Serialize with any possible pending coredump.
|
2008-07-25 04:47:41 -04:00
|
|
|
* We must hold mmap_sem around checking core_state
|
2005-04-16 18:20:36 -04:00
|
|
|
* and clearing tsk->mm. The core-inducing thread
|
2008-07-25 04:47:41 -04:00
|
|
|
* will increment ->nr_threads for each thread in the
|
2005-04-16 18:20:36 -04:00
|
|
|
* group with ->mm != NULL.
|
|
|
|
*/
|
|
|
|
down_read(&mm->mmap_sem);
|
2008-07-25 04:47:44 -04:00
|
|
|
core_state = mm->core_state;
|
|
|
|
if (core_state) {
|
|
|
|
struct core_thread self;
|
2005-04-16 18:20:36 -04:00
|
|
|
up_read(&mm->mmap_sem);
|
2008-07-25 04:47:42 -04:00
|
|
|
|
2008-07-25 04:47:44 -04:00
|
|
|
self.task = tsk;
|
|
|
|
self.next = xchg(&core_state->dumper.next, &self);
|
|
|
|
/*
|
|
|
|
* Implies mb(), the result of xchg() must be visible
|
|
|
|
* to core_state->dumper.
|
|
|
|
*/
|
|
|
|
if (atomic_dec_and_test(&core_state->nr_threads))
|
|
|
|
complete(&core_state->startup);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-07-25 04:47:46 -04:00
|
|
|
for (;;) {
|
|
|
|
set_task_state(tsk, TASK_UNINTERRUPTIBLE);
|
|
|
|
if (!self.task) /* see coredump_finish() */
|
|
|
|
break;
|
|
|
|
schedule();
|
|
|
|
}
|
|
|
|
__set_task_state(tsk, TASK_RUNNING);
|
2005-04-16 18:20:36 -04:00
|
|
|
down_read(&mm->mmap_sem);
|
|
|
|
}
|
|
|
|
atomic_inc(&mm->mm_count);
|
2006-06-23 05:06:06 -04:00
|
|
|
BUG_ON(mm != tsk->active_mm);
|
2005-04-16 18:20:36 -04:00
|
|
|
/* more a memory barrier than a real lock */
|
|
|
|
task_lock(tsk);
|
|
|
|
tsk->mm = NULL;
|
|
|
|
up_read(&mm->mmap_sem);
|
|
|
|
enter_lazy_tlb(mm, current);
|
2007-07-19 04:47:33 -04:00
|
|
|
/* We don't want this task to be frozen prematurely */
|
|
|
|
clear_freeze_flag(tsk);
|
2005-04-16 18:20:36 -04:00
|
|
|
task_unlock(tsk);
|
cgroups: add an owner to the mm_struct
Remove the mem_cgroup member from mm_struct and instead adds an owner.
This approach was suggested by Paul Menage. The advantage of this approach
is that, once the mm->owner is known, using the subsystem id, the cgroup
can be determined. It also allows several control groups that are
virtually grouped by mm_struct, to exist independent of the memory
controller i.e., without adding mem_cgroup's for each controller, to
mm_struct.
A new config option CONFIG_MM_OWNER is added and the memory resource
controller selects this config option.
This patch also adds cgroup callbacks to notify subsystems when mm->owner
changes. The mm_cgroup_changed callback is called with the task_lock() of
the new task held and is called just prior to changing the mm->owner.
I am indebted to Paul Menage for the several reviews of this patchset and
helping me make it lighter and simpler.
This patch was tested on a powerpc box, it was compiled with both the
MM_OWNER config turned on and off.
After the thread group leader exits, it's moved to init_css_state by
cgroup_exit(), thus all future charges from runnings threads would be
redirected to the init_css_set's subsystem.
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: Sudhir Kumar <skumar@linux.vnet.ibm.com>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Cc: Hirokazu Takahashi <taka@valinux.co.jp>
Cc: David Rientjes <rientjes@google.com>,
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Reviewed-by: Paul Menage <menage@google.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-04-29 04:00:16 -04:00
|
|
|
mm_update_next_owner(mm);
|
2005-04-16 18:20:36 -04:00
|
|
|
mmput(mm);
|
|
|
|
}
|
|
|
|
|
2008-04-09 02:12:30 -04:00
|
|
|
/*
|
|
|
|
* Return nonzero if @parent's children should reap themselves.
|
|
|
|
*
|
|
|
|
* Called with write_lock_irq(&tasklist_lock) held.
|
|
|
|
*/
|
|
|
|
static int ignoring_children(struct task_struct *parent)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct sighand_struct *psig = parent->sighand;
|
|
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&psig->siglock, flags);
|
|
|
|
ret = (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
|
|
|
|
(psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT));
|
|
|
|
spin_unlock_irqrestore(&psig->siglock, flags);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
/*
|
|
|
|
* Detach all tasks we were using ptrace on.
|
|
|
|
* Any that need to be release_task'd are put on the @dead list.
|
|
|
|
*
|
|
|
|
* Called with write_lock(&tasklist_lock) held.
|
|
|
|
*/
|
|
|
|
static void ptrace_exit(struct task_struct *parent, struct list_head *dead)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2008-03-24 21:36:23 -04:00
|
|
|
struct task_struct *p, *n;
|
2008-04-09 02:12:30 -04:00
|
|
|
int ign = -1;
|
2006-12-24 15:30:44 -05:00
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
list_for_each_entry_safe(p, n, &parent->ptraced, ptrace_entry) {
|
|
|
|
__ptrace_unlink(p);
|
|
|
|
|
|
|
|
if (p->exit_state != EXIT_ZOMBIE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If it's a zombie, our attachedness prevented normal
|
|
|
|
* parent notification or self-reaping. Do notification
|
|
|
|
* now if it would have happened earlier. If it should
|
|
|
|
* reap itself, add it to the @dead list. We can't call
|
|
|
|
* release_task() here because we already hold tasklist_lock.
|
|
|
|
*
|
|
|
|
* If it's our own child, there is no notification to do.
|
2008-04-09 02:12:30 -04:00
|
|
|
* But if our normal children self-reap, then this child
|
|
|
|
* was prevented by ptrace and we must reap it now.
|
2005-04-16 18:20:36 -04:00
|
|
|
*/
|
2008-03-24 21:36:23 -04:00
|
|
|
if (!task_detached(p) && thread_group_empty(p)) {
|
|
|
|
if (!same_thread_group(p->real_parent, parent))
|
|
|
|
do_notify_parent(p, p->exit_signal);
|
2008-04-09 02:12:30 -04:00
|
|
|
else {
|
|
|
|
if (ign < 0)
|
|
|
|
ign = ignoring_children(parent);
|
|
|
|
if (ign)
|
|
|
|
p->exit_signal = -1;
|
|
|
|
}
|
2008-03-24 21:36:23 -04:00
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
if (task_detached(p)) {
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
2008-03-24 21:36:23 -04:00
|
|
|
* Mark it as in the process of being reaped.
|
2005-04-16 18:20:36 -04:00
|
|
|
*/
|
2008-03-24 21:36:23 -04:00
|
|
|
p->exit_state = EXIT_DEAD;
|
|
|
|
list_add(&p->ptrace_entry, dead);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
}
|
2008-03-24 21:36:23 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finish up exit-time ptrace cleanup.
|
|
|
|
*
|
|
|
|
* Called without locks.
|
|
|
|
*/
|
|
|
|
static void ptrace_exit_finish(struct task_struct *parent,
|
|
|
|
struct list_head *dead)
|
|
|
|
{
|
|
|
|
struct task_struct *p, *n;
|
|
|
|
|
|
|
|
BUG_ON(!list_empty(&parent->ptraced));
|
|
|
|
|
|
|
|
list_for_each_entry_safe(p, n, dead, ptrace_entry) {
|
|
|
|
list_del_init(&p->ptrace_entry);
|
|
|
|
release_task(p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void reparent_thread(struct task_struct *p, struct task_struct *father)
|
|
|
|
{
|
|
|
|
if (p->pdeath_signal)
|
|
|
|
/* We already hold the tasklist_lock here. */
|
|
|
|
group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p);
|
|
|
|
|
|
|
|
list_move_tail(&p->sibling, &p->real_parent->children);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-12-21 23:28:40 -05:00
|
|
|
/* If this is a threaded reparent there is no need to
|
|
|
|
* notify anyone anything has happened.
|
|
|
|
*/
|
2008-04-30 03:53:12 -04:00
|
|
|
if (same_thread_group(p->real_parent, father))
|
2006-12-21 23:28:40 -05:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* We don't want people slaying init. */
|
2008-04-30 03:53:11 -04:00
|
|
|
if (!task_detached(p))
|
2006-12-21 23:28:40 -05:00
|
|
|
p->exit_signal = SIGCHLD;
|
|
|
|
|
|
|
|
/* If we'd notified the old parent about this child's death,
|
|
|
|
* also notify the new parent.
|
|
|
|
*/
|
2008-03-24 21:36:23 -04:00
|
|
|
if (!ptrace_reparented(p) &&
|
|
|
|
p->exit_state == EXIT_ZOMBIE &&
|
2008-04-30 03:53:11 -04:00
|
|
|
!task_detached(p) && thread_group_empty(p))
|
2006-12-21 23:28:40 -05:00
|
|
|
do_notify_parent(p, p->exit_signal);
|
|
|
|
|
2008-03-02 13:44:40 -05:00
|
|
|
kill_orphaned_pgrp(p, father);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When we die, we re-parent all our children.
|
|
|
|
* Try to give them to another thread in our thread
|
|
|
|
* group, and if no such member exists, give it to
|
2006-12-08 05:38:01 -05:00
|
|
|
* the child reaper process (ie "init") in our pid
|
|
|
|
* space.
|
2005-04-16 18:20:36 -04:00
|
|
|
*/
|
pid namespaces: rework forget_original_parent()
A pid namespace is a "view" of a particular set of tasks on the system. They
work in a similar way to filesystem namespaces. A file (or a process) can be
accessed in multiple namespaces, but it may have a different name in each. In
a filesystem, this name might be /etc/passwd in one namespace, but
/chroot/etc/passwd in another.
For processes, a process may have pid 1234 in one namespace, but be pid 1 in
another. This allows new pid namespaces to have basically arbitrary pids, and
not have to worry about what pids exist in other namespaces. This is
essential for checkpoint/restart where a restarted process's pid might collide
with an existing process on the system's pid.
In this particular implementation, pid namespaces have a parent-child
relationship, just like processes. A process in a pid namespace may see all
of the processes in the same namespace, as well as all of the processes in all
of the namespaces which are children of its namespace. Processes may not,
however, see others which are in their parent's namespace, but not in their
own. The same goes for sibling namespaces.
The know issue to be solved in the nearest future is signal handling in the
namespace boundary. That is, currently the namespace's init is treated like
an ordinary task that can be killed from within an namespace. Ideally, the
signal handling by the namespace's init should have two sides: when signaling
the init from its namespace, the init should look like a real init task, i.e.
receive only those signals, that is explicitly wants to; when signaling the
init from one of the parent namespaces, init should look like an ordinary
task, i.e. receive any signal, only taking the general permissions into
account.
The pid namespace was developed by Pavel Emlyanov and Sukadev Bhattiprolu and
we eventually came to almost the same implementation, which differed in some
details. This set is based on Pavel's patches, but it includes comments and
patches that from Sukadev.
Many thanks to Oleg, who reviewed the patches, pointed out many BUGs and made
valuable advises on how to make this set cleaner.
This patch:
We have to call exit_task_namespaces() only after the exiting task has
reparented all his children and is sure that no other threads will reparent
theirs for it. Why this is needed is explained in appropriate patch. This
one only reworks the forget_original_parent() so that after calling this a
task cannot be/become parent of any other task.
We check PF_EXITING instead of ->exit_state while choosing the new parent.
Note that tasklits_lock acts as a barrier, everyone who takes tasklist after
us (when forget_original_parent() drops it) must see PF_EXITING.
The other changes are just cleanups. They just move some code from
exit_notify to forget_original_parent(). It is a bit silly to declare
ptrace_dead in exit_notify(), take tasklist, pass ptrace_dead to
forget_original_parent(), unlock-lock-unlock tasklist, and then use
ptrace_dead.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 02:40:00 -04:00
|
|
|
static void forget_original_parent(struct task_struct *father)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2007-10-19 02:39:57 -04:00
|
|
|
struct task_struct *p, *n, *reaper = father;
|
2008-03-24 21:36:23 -04:00
|
|
|
LIST_HEAD(ptrace_dead);
|
pid namespaces: rework forget_original_parent()
A pid namespace is a "view" of a particular set of tasks on the system. They
work in a similar way to filesystem namespaces. A file (or a process) can be
accessed in multiple namespaces, but it may have a different name in each. In
a filesystem, this name might be /etc/passwd in one namespace, but
/chroot/etc/passwd in another.
For processes, a process may have pid 1234 in one namespace, but be pid 1 in
another. This allows new pid namespaces to have basically arbitrary pids, and
not have to worry about what pids exist in other namespaces. This is
essential for checkpoint/restart where a restarted process's pid might collide
with an existing process on the system's pid.
In this particular implementation, pid namespaces have a parent-child
relationship, just like processes. A process in a pid namespace may see all
of the processes in the same namespace, as well as all of the processes in all
of the namespaces which are children of its namespace. Processes may not,
however, see others which are in their parent's namespace, but not in their
own. The same goes for sibling namespaces.
The know issue to be solved in the nearest future is signal handling in the
namespace boundary. That is, currently the namespace's init is treated like
an ordinary task that can be killed from within an namespace. Ideally, the
signal handling by the namespace's init should have two sides: when signaling
the init from its namespace, the init should look like a real init task, i.e.
receive only those signals, that is explicitly wants to; when signaling the
init from one of the parent namespaces, init should look like an ordinary
task, i.e. receive any signal, only taking the general permissions into
account.
The pid namespace was developed by Pavel Emlyanov and Sukadev Bhattiprolu and
we eventually came to almost the same implementation, which differed in some
details. This set is based on Pavel's patches, but it includes comments and
patches that from Sukadev.
Many thanks to Oleg, who reviewed the patches, pointed out many BUGs and made
valuable advises on how to make this set cleaner.
This patch:
We have to call exit_task_namespaces() only after the exiting task has
reparented all his children and is sure that no other threads will reparent
theirs for it. Why this is needed is explained in appropriate patch. This
one only reworks the forget_original_parent() so that after calling this a
task cannot be/become parent of any other task.
We check PF_EXITING instead of ->exit_state while choosing the new parent.
Note that tasklits_lock acts as a barrier, everyone who takes tasklist after
us (when forget_original_parent() drops it) must see PF_EXITING.
The other changes are just cleanups. They just move some code from
exit_notify to forget_original_parent(). It is a bit silly to declare
ptrace_dead in exit_notify(), take tasklist, pass ptrace_dead to
forget_original_parent(), unlock-lock-unlock tasklist, and then use
ptrace_dead.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 02:40:00 -04:00
|
|
|
|
|
|
|
write_lock_irq(&tasklist_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
/*
|
|
|
|
* First clean up ptrace if we were using it.
|
|
|
|
*/
|
|
|
|
ptrace_exit(father, &ptrace_dead);
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
do {
|
|
|
|
reaper = next_thread(reaper);
|
|
|
|
if (reaper == father) {
|
2007-10-19 02:39:50 -04:00
|
|
|
reaper = task_child_reaper(father);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
}
|
pid namespaces: rework forget_original_parent()
A pid namespace is a "view" of a particular set of tasks on the system. They
work in a similar way to filesystem namespaces. A file (or a process) can be
accessed in multiple namespaces, but it may have a different name in each. In
a filesystem, this name might be /etc/passwd in one namespace, but
/chroot/etc/passwd in another.
For processes, a process may have pid 1234 in one namespace, but be pid 1 in
another. This allows new pid namespaces to have basically arbitrary pids, and
not have to worry about what pids exist in other namespaces. This is
essential for checkpoint/restart where a restarted process's pid might collide
with an existing process on the system's pid.
In this particular implementation, pid namespaces have a parent-child
relationship, just like processes. A process in a pid namespace may see all
of the processes in the same namespace, as well as all of the processes in all
of the namespaces which are children of its namespace. Processes may not,
however, see others which are in their parent's namespace, but not in their
own. The same goes for sibling namespaces.
The know issue to be solved in the nearest future is signal handling in the
namespace boundary. That is, currently the namespace's init is treated like
an ordinary task that can be killed from within an namespace. Ideally, the
signal handling by the namespace's init should have two sides: when signaling
the init from its namespace, the init should look like a real init task, i.e.
receive only those signals, that is explicitly wants to; when signaling the
init from one of the parent namespaces, init should look like an ordinary
task, i.e. receive any signal, only taking the general permissions into
account.
The pid namespace was developed by Pavel Emlyanov and Sukadev Bhattiprolu and
we eventually came to almost the same implementation, which differed in some
details. This set is based on Pavel's patches, but it includes comments and
patches that from Sukadev.
Many thanks to Oleg, who reviewed the patches, pointed out many BUGs and made
valuable advises on how to make this set cleaner.
This patch:
We have to call exit_task_namespaces() only after the exiting task has
reparented all his children and is sure that no other threads will reparent
theirs for it. Why this is needed is explained in appropriate patch. This
one only reworks the forget_original_parent() so that after calling this a
task cannot be/become parent of any other task.
We check PF_EXITING instead of ->exit_state while choosing the new parent.
Note that tasklits_lock acts as a barrier, everyone who takes tasklist after
us (when forget_original_parent() drops it) must see PF_EXITING.
The other changes are just cleanups. They just move some code from
exit_notify to forget_original_parent(). It is a bit silly to declare
ptrace_dead in exit_notify(), take tasklist, pass ptrace_dead to
forget_original_parent(), unlock-lock-unlock tasklist, and then use
ptrace_dead.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 02:40:00 -04:00
|
|
|
} while (reaper->flags & PF_EXITING);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-10-19 02:39:57 -04:00
|
|
|
list_for_each_entry_safe(p, n, &father->children, sibling) {
|
2007-10-17 02:26:49 -04:00
|
|
|
p->real_parent = reaper;
|
2008-03-24 21:36:23 -04:00
|
|
|
if (p->parent == father) {
|
|
|
|
BUG_ON(p->ptrace);
|
|
|
|
p->parent = p->real_parent;
|
|
|
|
}
|
|
|
|
reparent_thread(p, father);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
pid namespaces: rework forget_original_parent()
A pid namespace is a "view" of a particular set of tasks on the system. They
work in a similar way to filesystem namespaces. A file (or a process) can be
accessed in multiple namespaces, but it may have a different name in each. In
a filesystem, this name might be /etc/passwd in one namespace, but
/chroot/etc/passwd in another.
For processes, a process may have pid 1234 in one namespace, but be pid 1 in
another. This allows new pid namespaces to have basically arbitrary pids, and
not have to worry about what pids exist in other namespaces. This is
essential for checkpoint/restart where a restarted process's pid might collide
with an existing process on the system's pid.
In this particular implementation, pid namespaces have a parent-child
relationship, just like processes. A process in a pid namespace may see all
of the processes in the same namespace, as well as all of the processes in all
of the namespaces which are children of its namespace. Processes may not,
however, see others which are in their parent's namespace, but not in their
own. The same goes for sibling namespaces.
The know issue to be solved in the nearest future is signal handling in the
namespace boundary. That is, currently the namespace's init is treated like
an ordinary task that can be killed from within an namespace. Ideally, the
signal handling by the namespace's init should have two sides: when signaling
the init from its namespace, the init should look like a real init task, i.e.
receive only those signals, that is explicitly wants to; when signaling the
init from one of the parent namespaces, init should look like an ordinary
task, i.e. receive any signal, only taking the general permissions into
account.
The pid namespace was developed by Pavel Emlyanov and Sukadev Bhattiprolu and
we eventually came to almost the same implementation, which differed in some
details. This set is based on Pavel's patches, but it includes comments and
patches that from Sukadev.
Many thanks to Oleg, who reviewed the patches, pointed out many BUGs and made
valuable advises on how to make this set cleaner.
This patch:
We have to call exit_task_namespaces() only after the exiting task has
reparented all his children and is sure that no other threads will reparent
theirs for it. Why this is needed is explained in appropriate patch. This
one only reworks the forget_original_parent() so that after calling this a
task cannot be/become parent of any other task.
We check PF_EXITING instead of ->exit_state while choosing the new parent.
Note that tasklits_lock acts as a barrier, everyone who takes tasklist after
us (when forget_original_parent() drops it) must see PF_EXITING.
The other changes are just cleanups. They just move some code from
exit_notify to forget_original_parent(). It is a bit silly to declare
ptrace_dead in exit_notify(), take tasklist, pass ptrace_dead to
forget_original_parent(), unlock-lock-unlock tasklist, and then use
ptrace_dead.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 02:40:00 -04:00
|
|
|
|
|
|
|
write_unlock_irq(&tasklist_lock);
|
|
|
|
BUG_ON(!list_empty(&father->children));
|
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
ptrace_exit_finish(father, &ptrace_dead);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Send signals to all our closest relatives so that they know
|
|
|
|
* to properly mourn us..
|
|
|
|
*/
|
2008-03-02 13:44:44 -05:00
|
|
|
static void exit_notify(struct task_struct *tsk, int group_dead)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2008-07-25 22:45:54 -04:00
|
|
|
int signal;
|
|
|
|
void *cookie;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This does two things:
|
|
|
|
*
|
|
|
|
* A. Make init inherit all the child processes
|
|
|
|
* B. Check to see if any process groups have become orphaned
|
|
|
|
* as a result of our exiting, and if they have any stopped
|
|
|
|
* jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2)
|
|
|
|
*/
|
pid namespaces: rework forget_original_parent()
A pid namespace is a "view" of a particular set of tasks on the system. They
work in a similar way to filesystem namespaces. A file (or a process) can be
accessed in multiple namespaces, but it may have a different name in each. In
a filesystem, this name might be /etc/passwd in one namespace, but
/chroot/etc/passwd in another.
For processes, a process may have pid 1234 in one namespace, but be pid 1 in
another. This allows new pid namespaces to have basically arbitrary pids, and
not have to worry about what pids exist in other namespaces. This is
essential for checkpoint/restart where a restarted process's pid might collide
with an existing process on the system's pid.
In this particular implementation, pid namespaces have a parent-child
relationship, just like processes. A process in a pid namespace may see all
of the processes in the same namespace, as well as all of the processes in all
of the namespaces which are children of its namespace. Processes may not,
however, see others which are in their parent's namespace, but not in their
own. The same goes for sibling namespaces.
The know issue to be solved in the nearest future is signal handling in the
namespace boundary. That is, currently the namespace's init is treated like
an ordinary task that can be killed from within an namespace. Ideally, the
signal handling by the namespace's init should have two sides: when signaling
the init from its namespace, the init should look like a real init task, i.e.
receive only those signals, that is explicitly wants to; when signaling the
init from one of the parent namespaces, init should look like an ordinary
task, i.e. receive any signal, only taking the general permissions into
account.
The pid namespace was developed by Pavel Emlyanov and Sukadev Bhattiprolu and
we eventually came to almost the same implementation, which differed in some
details. This set is based on Pavel's patches, but it includes comments and
patches that from Sukadev.
Many thanks to Oleg, who reviewed the patches, pointed out many BUGs and made
valuable advises on how to make this set cleaner.
This patch:
We have to call exit_task_namespaces() only after the exiting task has
reparented all his children and is sure that no other threads will reparent
theirs for it. Why this is needed is explained in appropriate patch. This
one only reworks the forget_original_parent() so that after calling this a
task cannot be/become parent of any other task.
We check PF_EXITING instead of ->exit_state while choosing the new parent.
Note that tasklits_lock acts as a barrier, everyone who takes tasklist after
us (when forget_original_parent() drops it) must see PF_EXITING.
The other changes are just cleanups. They just move some code from
exit_notify to forget_original_parent(). It is a bit silly to declare
ptrace_dead in exit_notify(), take tasklist, pass ptrace_dead to
forget_original_parent(), unlock-lock-unlock tasklist, and then use
ptrace_dead.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 02:40:00 -04:00
|
|
|
forget_original_parent(tsk);
|
2007-10-19 02:40:01 -04:00
|
|
|
exit_task_namespaces(tsk);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
pid namespaces: rework forget_original_parent()
A pid namespace is a "view" of a particular set of tasks on the system. They
work in a similar way to filesystem namespaces. A file (or a process) can be
accessed in multiple namespaces, but it may have a different name in each. In
a filesystem, this name might be /etc/passwd in one namespace, but
/chroot/etc/passwd in another.
For processes, a process may have pid 1234 in one namespace, but be pid 1 in
another. This allows new pid namespaces to have basically arbitrary pids, and
not have to worry about what pids exist in other namespaces. This is
essential for checkpoint/restart where a restarted process's pid might collide
with an existing process on the system's pid.
In this particular implementation, pid namespaces have a parent-child
relationship, just like processes. A process in a pid namespace may see all
of the processes in the same namespace, as well as all of the processes in all
of the namespaces which are children of its namespace. Processes may not,
however, see others which are in their parent's namespace, but not in their
own. The same goes for sibling namespaces.
The know issue to be solved in the nearest future is signal handling in the
namespace boundary. That is, currently the namespace's init is treated like
an ordinary task that can be killed from within an namespace. Ideally, the
signal handling by the namespace's init should have two sides: when signaling
the init from its namespace, the init should look like a real init task, i.e.
receive only those signals, that is explicitly wants to; when signaling the
init from one of the parent namespaces, init should look like an ordinary
task, i.e. receive any signal, only taking the general permissions into
account.
The pid namespace was developed by Pavel Emlyanov and Sukadev Bhattiprolu and
we eventually came to almost the same implementation, which differed in some
details. This set is based on Pavel's patches, but it includes comments and
patches that from Sukadev.
Many thanks to Oleg, who reviewed the patches, pointed out many BUGs and made
valuable advises on how to make this set cleaner.
This patch:
We have to call exit_task_namespaces() only after the exiting task has
reparented all his children and is sure that no other threads will reparent
theirs for it. Why this is needed is explained in appropriate patch. This
one only reworks the forget_original_parent() so that after calling this a
task cannot be/become parent of any other task.
We check PF_EXITING instead of ->exit_state while choosing the new parent.
Note that tasklits_lock acts as a barrier, everyone who takes tasklist after
us (when forget_original_parent() drops it) must see PF_EXITING.
The other changes are just cleanups. They just move some code from
exit_notify to forget_original_parent(). It is a bit silly to declare
ptrace_dead in exit_notify(), take tasklist, pass ptrace_dead to
forget_original_parent(), unlock-lock-unlock tasklist, and then use
ptrace_dead.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 02:40:00 -04:00
|
|
|
write_lock_irq(&tasklist_lock);
|
2008-03-02 13:44:44 -05:00
|
|
|
if (group_dead)
|
|
|
|
kill_orphaned_pgrp(tsk->group_leader, NULL);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-08-03 17:04:41 -04:00
|
|
|
/* Let father know we died
|
2005-04-16 18:20:36 -04:00
|
|
|
*
|
|
|
|
* Thread signals are configurable, but you aren't going to use
|
2007-10-19 02:39:59 -04:00
|
|
|
* that to send signals to arbitary processes.
|
2005-04-16 18:20:36 -04:00
|
|
|
* That stops right now.
|
|
|
|
*
|
|
|
|
* If the parent exec id doesn't match the exec id we saved
|
|
|
|
* when we started then we know the parent has changed security
|
|
|
|
* domain.
|
|
|
|
*
|
|
|
|
* If our self_exec id doesn't match our parent_exec_id then
|
|
|
|
* we have changed execution domain as these two values started
|
|
|
|
* the same after a fork.
|
|
|
|
*/
|
2008-04-30 03:53:11 -04:00
|
|
|
if (tsk->exit_signal != SIGCHLD && !task_detached(tsk) &&
|
2008-03-02 13:44:40 -05:00
|
|
|
(tsk->parent_exec_id != tsk->real_parent->self_exec_id ||
|
2008-04-30 03:53:11 -04:00
|
|
|
tsk->self_exec_id != tsk->parent_exec_id) &&
|
|
|
|
!capable(CAP_KILL))
|
2005-04-16 18:20:36 -04:00
|
|
|
tsk->exit_signal = SIGCHLD;
|
|
|
|
|
2008-07-25 22:45:54 -04:00
|
|
|
signal = tracehook_notify_death(tsk, &cookie, group_dead);
|
|
|
|
if (signal > 0)
|
|
|
|
signal = do_notify_parent(tsk, signal);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-07-25 22:45:54 -04:00
|
|
|
tsk->exit_state = signal < 0 ? EXIT_DEAD : EXIT_ZOMBIE;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-04-30 03:53:12 -04:00
|
|
|
/* mt-exec, de_thread() is waiting for us */
|
2007-10-17 02:27:23 -04:00
|
|
|
if (thread_group_leader(tsk) &&
|
|
|
|
tsk->signal->notify_count < 0 &&
|
|
|
|
tsk->signal->group_exit_task)
|
|
|
|
wake_up_process(tsk->signal->group_exit_task);
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
write_unlock_irq(&tasklist_lock);
|
|
|
|
|
2008-07-25 22:45:54 -04:00
|
|
|
tracehook_report_death(tsk, signal, cookie, group_dead);
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/* If the process is dead, release it - nobody will wait for it */
|
2008-07-25 22:45:54 -04:00
|
|
|
if (signal < 0)
|
2005-04-16 18:20:36 -04:00
|
|
|
release_task(tsk);
|
|
|
|
}
|
|
|
|
|
2007-07-16 02:38:48 -04:00
|
|
|
#ifdef CONFIG_DEBUG_STACK_USAGE
|
|
|
|
static void check_stack_usage(void)
|
|
|
|
{
|
|
|
|
static DEFINE_SPINLOCK(low_water_lock);
|
|
|
|
static int lowest_to_date = THREAD_SIZE;
|
|
|
|
unsigned long *n = end_of_stack(current);
|
|
|
|
unsigned long free;
|
|
|
|
|
|
|
|
while (*n == 0)
|
|
|
|
n++;
|
|
|
|
free = (unsigned long)n - (unsigned long)end_of_stack(current);
|
|
|
|
|
|
|
|
if (free >= lowest_to_date)
|
|
|
|
return;
|
|
|
|
|
|
|
|
spin_lock(&low_water_lock);
|
|
|
|
if (free < lowest_to_date) {
|
|
|
|
printk(KERN_WARNING "%s used greatest stack depth: %lu bytes "
|
|
|
|
"left\n",
|
|
|
|
current->comm, free);
|
|
|
|
lowest_to_date = free;
|
|
|
|
}
|
|
|
|
spin_unlock(&low_water_lock);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void check_stack_usage(void) {}
|
|
|
|
#endif
|
|
|
|
|
2007-10-17 02:26:49 -04:00
|
|
|
static inline void exit_child_reaper(struct task_struct *tsk)
|
|
|
|
{
|
2007-10-19 02:39:50 -04:00
|
|
|
if (likely(tsk->group_leader != task_child_reaper(tsk)))
|
2007-10-17 02:26:49 -04:00
|
|
|
return;
|
|
|
|
|
2007-10-19 02:40:13 -04:00
|
|
|
if (tsk->nsproxy->pid_ns == &init_pid_ns)
|
|
|
|
panic("Attempted to kill init!");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @tsk is the last thread in the 'cgroup-init' and is exiting.
|
|
|
|
* Terminate all remaining processes in the namespace and reap them
|
|
|
|
* before exiting @tsk.
|
|
|
|
*
|
|
|
|
* Note that @tsk (last thread of cgroup-init) may not necessarily
|
|
|
|
* be the child-reaper (i.e main thread of cgroup-init) of the
|
|
|
|
* namespace i.e the child_reaper may have already exited.
|
|
|
|
*
|
|
|
|
* Even after a child_reaper exits, we let it inherit orphaned children,
|
|
|
|
* because, pid_ns->child_reaper remains valid as long as there is
|
|
|
|
* at least one living sub-thread in the cgroup init.
|
|
|
|
|
|
|
|
* This living sub-thread of the cgroup-init will be notified when
|
|
|
|
* a child inherited by the 'child-reaper' exits (do_notify_parent()
|
|
|
|
* uses __group_send_sig_info()). Further, when reaping child processes,
|
|
|
|
* do_wait() iterates over children of all living sub threads.
|
|
|
|
|
|
|
|
* i.e even though 'child_reaper' thread is listed as the parent of the
|
|
|
|
* orphaned children, any living sub-thread in the cgroup-init can
|
|
|
|
* perform the role of the child_reaper.
|
|
|
|
*/
|
|
|
|
zap_pid_ns_processes(tsk->nsproxy->pid_ns);
|
2007-10-17 02:26:49 -04:00
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:53 -05:00
|
|
|
NORET_TYPE void do_exit(long code)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct task_struct *tsk = current;
|
|
|
|
int group_dead;
|
|
|
|
|
|
|
|
profile_task_exit(tsk);
|
|
|
|
|
2005-06-27 04:55:12 -04:00
|
|
|
WARN_ON(atomic_read(&tsk->fs_excl));
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
if (unlikely(in_interrupt()))
|
|
|
|
panic("Aiee, killing interrupt handler!");
|
|
|
|
if (unlikely(!tsk->pid))
|
|
|
|
panic("Attempted to kill the idle task!");
|
|
|
|
|
2008-07-25 22:45:46 -04:00
|
|
|
tracehook_report_exit(&code);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2005-06-23 03:09:13 -04:00
|
|
|
/*
|
|
|
|
* We're taking recursive faults here in do_exit. Safest is to just
|
|
|
|
* leave this task alone and wait for reboot.
|
|
|
|
*/
|
|
|
|
if (unlikely(tsk->flags & PF_EXITING)) {
|
|
|
|
printk(KERN_ALERT
|
|
|
|
"Fixing recursive fault but reboot is needed!\n");
|
2007-06-08 16:47:00 -04:00
|
|
|
/*
|
|
|
|
* We can do this unlocked here. The futex code uses
|
|
|
|
* this flag just to verify whether the pi state
|
|
|
|
* cleanup has been done or not. In the worst case it
|
|
|
|
* loops once more. We pretend that the cleanup was
|
|
|
|
* done as there is no way to return. Either the
|
|
|
|
* OWNER_DIED bit is set by now or we push the blocked
|
|
|
|
* task into the wait for ever nirwana as well.
|
|
|
|
*/
|
|
|
|
tsk->flags |= PF_EXITPIDONE;
|
2006-02-28 12:51:55 -05:00
|
|
|
if (tsk->io_context)
|
|
|
|
exit_io_context();
|
2005-06-23 03:09:13 -04:00
|
|
|
set_current_state(TASK_UNINTERRUPTIBLE);
|
|
|
|
schedule();
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:12 -05:00
|
|
|
exit_signals(tsk); /* sets PF_EXITING */
|
2007-06-08 16:47:00 -04:00
|
|
|
/*
|
|
|
|
* tsk->flags are checked in the futex code to protect against
|
|
|
|
* an exiting task cleaning up the robust pi futexes.
|
|
|
|
*/
|
2007-10-17 02:26:47 -04:00
|
|
|
smp_mb();
|
|
|
|
spin_unlock_wait(&tsk->pi_lock);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
if (unlikely(in_atomic()))
|
|
|
|
printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
|
2007-10-19 02:40:40 -04:00
|
|
|
current->comm, task_pid_nr(current),
|
2005-04-16 18:20:36 -04:00
|
|
|
preempt_count());
|
|
|
|
|
|
|
|
acct_update_integrals(tsk);
|
[PATCH] mm: update_hiwaters just in time
update_mem_hiwater has attracted various criticisms, in particular from those
concerned with mm scalability. Originally it was called whenever rss or
total_vm got raised. Then many of those callsites were replaced by a timer
tick call from account_system_time. Now Frank van Maarseveen reports that to
be found inadequate. How about this? Works for Frank.
Replace update_mem_hiwater, a poor combination of two unrelated ops, by macros
update_hiwater_rss and update_hiwater_vm. Don't attempt to keep
mm->hiwater_rss up to date at timer tick, nor every time we raise rss (usually
by 1): those are hot paths. Do the opposite, update only when about to lower
rss (usually by many), or just before final accounting in do_exit. Handle
mm->hiwater_vm in the same way, though it's much less of an issue. Demand
that whoever collects these hiwater statistics do the work of taking the
maximum with rss or total_vm.
And there has been no collector of these hiwater statistics in the tree. The
new convention needs an example, so match Frank's usage by adding a VmPeak
line above VmSize to /proc/<pid>/status, and also a VmHWM line above VmRSS
(High-Water-Mark or High-Water-Memory).
There was a particular anomaly during mremap move, that hiwater_vm might be
captured too high. A fleeting such anomaly remains, but it's quickly
corrected now, whereas before it would stick.
What locking? None: if the app is racy then these statistics will be racy,
it's not worth any overhead to make them exact. But whenever it suits,
hiwater_vm is updated under exclusive mmap_sem, and hiwater_rss under
page_table_lock (for now) or with preemption disabled (later on): without
going to any trouble, minimize the time between reading current values and
updating, to minimize those occasions when a racing thread bumps a count up
and back down in between.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-29 21:16:18 -04:00
|
|
|
if (tsk->mm) {
|
|
|
|
update_hiwater_rss(tsk->mm);
|
|
|
|
update_hiwater_vm(tsk->mm);
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
group_dead = atomic_dec_and_test(&tsk->signal->live);
|
2005-08-04 19:49:32 -04:00
|
|
|
if (group_dead) {
|
2007-10-17 02:26:49 -04:00
|
|
|
exit_child_reaper(tsk);
|
2007-06-08 16:47:00 -04:00
|
|
|
hrtimer_cancel(&tsk->signal->real_timer);
|
2005-10-21 18:03:29 -04:00
|
|
|
exit_itimers(tsk->signal);
|
2005-08-04 19:49:32 -04:00
|
|
|
}
|
2006-06-25 08:49:25 -04:00
|
|
|
acct_collect(code, group_dead);
|
2007-10-17 02:27:30 -04:00
|
|
|
#ifdef CONFIG_FUTEX
|
2006-03-27 04:16:22 -05:00
|
|
|
if (unlikely(tsk->robust_list))
|
|
|
|
exit_robust_list(tsk);
|
2007-10-17 02:27:30 -04:00
|
|
|
#ifdef CONFIG_COMPAT
|
2006-03-27 04:16:24 -05:00
|
|
|
if (unlikely(tsk->compat_robust_list))
|
|
|
|
compat_exit_robust_list(tsk);
|
2007-10-17 02:27:30 -04:00
|
|
|
#endif
|
2006-03-27 04:16:24 -05:00
|
|
|
#endif
|
Audit: add TTY input auditing
Add TTY input auditing, used to audit system administrator's actions. This is
required by various security standards such as DCID 6/3 and PCI to provide
non-repudiation of administrator's actions and to allow a review of past
actions if the administrator seems to overstep their duties or if the system
becomes misconfigured for unknown reasons. These requirements do not make it
necessary to audit TTY output as well.
Compared to an user-space keylogger, this approach records TTY input using the
audit subsystem, correlated with other audit events, and it is completely
transparent to the user-space application (e.g. the console ioctls still
work).
TTY input auditing works on a higher level than auditing all system calls
within the session, which would produce an overwhelming amount of mostly
useless audit events.
Add an "audit_tty" attribute, inherited across fork (). Data read from TTYs
by process with the attribute is sent to the audit subsystem by the kernel.
The audit netlink interface is extended to allow modifying the audit_tty
attribute, and to allow sending explanatory audit events from user-space (for
example, a shell might send an event containing the final command, after the
interactive command-line editing and history expansion is performed, which
might be difficult to decipher from the TTY input alone).
Because the "audit_tty" attribute is inherited across fork (), it would be set
e.g. for sshd restarted within an audited session. To prevent this, the
audit_tty attribute is cleared when a process with no open TTY file
descriptors (e.g. after daemon startup) opens a TTY.
See https://www.redhat.com/archives/linux-audit/2007-June/msg00000.html for a
more detailed rationale document for an older version of this patch.
[akpm@linux-foundation.org: build fix]
Signed-off-by: Miloslav Trmac <mitr@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Paul Fulghum <paulkf@microgate.com>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Cc: Steve Grubb <sgrubb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-07-16 02:40:56 -04:00
|
|
|
if (group_dead)
|
|
|
|
tty_audit_exit();
|
2006-03-29 20:30:19 -05:00
|
|
|
if (unlikely(tsk->audit_context))
|
|
|
|
audit_free(tsk);
|
2006-12-06 23:36:51 -05:00
|
|
|
|
2007-08-31 02:56:23 -04:00
|
|
|
tsk->exit_code = code;
|
2006-12-06 23:36:51 -05:00
|
|
|
taskstats_exit(tsk, group_dead);
|
2006-07-14 03:24:40 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
exit_mm(tsk);
|
|
|
|
|
2006-06-25 08:49:24 -04:00
|
|
|
if (group_dead)
|
2006-06-25 08:49:25 -04:00
|
|
|
acct_process();
|
2005-04-16 18:20:36 -04:00
|
|
|
exit_sem(tsk);
|
2008-04-22 05:35:42 -04:00
|
|
|
exit_files(tsk);
|
|
|
|
exit_fs(tsk);
|
2007-07-16 02:38:48 -04:00
|
|
|
check_stack_usage();
|
2005-04-16 18:20:36 -04:00
|
|
|
exit_thread();
|
2007-10-19 02:39:33 -04:00
|
|
|
cgroup_exit(tsk, 1);
|
2005-04-16 18:20:36 -04:00
|
|
|
exit_keys(tsk);
|
|
|
|
|
|
|
|
if (group_dead && tsk->signal->leader)
|
|
|
|
disassociate_ctty(1);
|
|
|
|
|
2005-11-13 19:06:55 -05:00
|
|
|
module_put(task_thread_info(tsk)->exec_domain->module);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (tsk->binfmt)
|
|
|
|
module_put(tsk->binfmt->module);
|
|
|
|
|
2005-11-07 03:59:16 -05:00
|
|
|
proc_exit_connector(tsk);
|
2008-03-02 13:44:44 -05:00
|
|
|
exit_notify(tsk, group_dead);
|
2005-04-16 18:20:36 -04:00
|
|
|
#ifdef CONFIG_NUMA
|
2008-04-28 05:13:08 -04:00
|
|
|
mpol_put(tsk->mempolicy);
|
2005-04-16 18:20:36 -04:00
|
|
|
tsk->mempolicy = NULL;
|
|
|
|
#endif
|
2007-10-17 02:27:30 -04:00
|
|
|
#ifdef CONFIG_FUTEX
|
2006-06-27 05:54:58 -04:00
|
|
|
/*
|
|
|
|
* This must happen late, after the PID is not
|
|
|
|
* hashed anymore:
|
|
|
|
*/
|
|
|
|
if (unlikely(!list_empty(&tsk->pi_state_list)))
|
|
|
|
exit_pi_state_list(tsk);
|
|
|
|
if (unlikely(current->pi_state_cache))
|
|
|
|
kfree(current->pi_state_cache);
|
2007-10-17 02:27:30 -04:00
|
|
|
#endif
|
2006-01-09 18:59:21 -05:00
|
|
|
/*
|
2006-07-03 03:24:33 -04:00
|
|
|
* Make sure we are holding no locks:
|
2006-01-09 18:59:21 -05:00
|
|
|
*/
|
2006-07-03 03:24:33 -04:00
|
|
|
debug_check_no_locks_held(tsk);
|
2007-06-08 16:47:00 -04:00
|
|
|
/*
|
|
|
|
* We can do this unlocked here. The futex code uses this flag
|
|
|
|
* just to verify whether the pi state cleanup has been done
|
|
|
|
* or not. In the worst case it loops once more.
|
|
|
|
*/
|
|
|
|
tsk->flags |= PF_EXITPIDONE;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2006-02-28 12:51:55 -05:00
|
|
|
if (tsk->io_context)
|
|
|
|
exit_io_context();
|
|
|
|
|
2006-04-11 07:52:07 -04:00
|
|
|
if (tsk->splice_pipe)
|
|
|
|
__free_pipe_info(tsk->splice_pipe);
|
|
|
|
|
2005-10-30 18:02:47 -05:00
|
|
|
preempt_disable();
|
2006-09-29 05:01:10 -04:00
|
|
|
/* causes final put_task_struct in finish_task_switch(). */
|
2006-09-29 05:01:11 -04:00
|
|
|
tsk->state = TASK_DEAD;
|
2005-10-30 18:02:47 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
schedule();
|
|
|
|
BUG();
|
|
|
|
/* Avoid "noreturn function does return". */
|
2006-09-29 05:00:42 -04:00
|
|
|
for (;;)
|
|
|
|
cpu_relax(); /* For when BUG is null */
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2005-04-23 03:08:00 -04:00
|
|
|
EXPORT_SYMBOL_GPL(do_exit);
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
NORET_TYPE void complete_and_exit(struct completion *comp, long code)
|
|
|
|
{
|
|
|
|
if (comp)
|
|
|
|
complete(comp);
|
2006-09-29 05:01:10 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
do_exit(code);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(complete_and_exit);
|
|
|
|
|
|
|
|
asmlinkage long sys_exit(int error_code)
|
|
|
|
{
|
|
|
|
do_exit((error_code&0xff)<<8);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take down every thread in the group. This is called by fatal signals
|
|
|
|
* as well as by sys_exit_group (below).
|
|
|
|
*/
|
|
|
|
NORET_TYPE void
|
|
|
|
do_group_exit(int exit_code)
|
|
|
|
{
|
2008-04-30 03:52:36 -04:00
|
|
|
struct signal_struct *sig = current->signal;
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
BUG_ON(exit_code & 0x80); /* core dumps don't get here */
|
|
|
|
|
2008-04-30 03:52:36 -04:00
|
|
|
if (signal_group_exit(sig))
|
|
|
|
exit_code = sig->group_exit_code;
|
2005-04-16 18:20:36 -04:00
|
|
|
else if (!thread_group_empty(current)) {
|
|
|
|
struct sighand_struct *const sighand = current->sighand;
|
|
|
|
spin_lock_irq(&sighand->siglock);
|
2008-02-05 01:27:24 -05:00
|
|
|
if (signal_group_exit(sig))
|
2005-04-16 18:20:36 -04:00
|
|
|
/* Another thread got here before we took the lock. */
|
|
|
|
exit_code = sig->group_exit_code;
|
|
|
|
else {
|
|
|
|
sig->group_exit_code = exit_code;
|
2008-02-05 01:27:24 -05:00
|
|
|
sig->flags = SIGNAL_GROUP_EXIT;
|
2005-04-16 18:20:36 -04:00
|
|
|
zap_other_threads(current);
|
|
|
|
}
|
|
|
|
spin_unlock_irq(&sighand->siglock);
|
|
|
|
}
|
|
|
|
|
|
|
|
do_exit(exit_code);
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* this kills every thread in the thread group. Note that any externally
|
|
|
|
* wait4()-ing process will get the correct exit code - even if this
|
|
|
|
* thread is not the thread group leader.
|
|
|
|
*/
|
|
|
|
asmlinkage void sys_exit_group(int error_code)
|
|
|
|
{
|
|
|
|
do_group_exit((error_code & 0xff) << 8);
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:14 -05:00
|
|
|
static struct pid *task_pid_type(struct task_struct *task, enum pid_type type)
|
|
|
|
{
|
|
|
|
struct pid *pid = NULL;
|
|
|
|
if (type == PIDTYPE_PID)
|
|
|
|
pid = task->pids[type].pid;
|
|
|
|
else if (type < PIDTYPE_MAX)
|
|
|
|
pid = task->group_leader->pids[type].pid;
|
|
|
|
return pid;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int eligible_child(enum pid_type type, struct pid *pid, int options,
|
|
|
|
struct task_struct *p)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2007-05-06 17:50:20 -04:00
|
|
|
int err;
|
|
|
|
|
2008-02-08 07:19:14 -05:00
|
|
|
if (type < PIDTYPE_MAX) {
|
|
|
|
if (task_pid_type(p, type) != pid)
|
2005-04-16 18:20:36 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for all children (clone and not) if __WALL is set;
|
|
|
|
* otherwise, wait for clone children *only* if __WCLONE is
|
|
|
|
* set; otherwise, wait for non-clone children *only*. (Note:
|
|
|
|
* A "clone" child here is one that reports to its parent
|
|
|
|
* using a signal other than SIGCHLD.) */
|
|
|
|
if (((p->exit_signal != SIGCHLD) ^ ((options & __WCLONE) != 0))
|
|
|
|
&& !(options & __WALL))
|
|
|
|
return 0;
|
|
|
|
|
2007-05-06 17:50:20 -04:00
|
|
|
err = security_task_wait(p);
|
2008-03-30 21:41:25 -04:00
|
|
|
if (err)
|
|
|
|
return err;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-03-30 21:41:25 -04:00
|
|
|
return 1;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2006-07-03 03:25:41 -04:00
|
|
|
static int wait_noreap_copyout(struct task_struct *p, pid_t pid, uid_t uid,
|
2005-04-16 18:20:36 -04:00
|
|
|
int why, int status,
|
|
|
|
struct siginfo __user *infop,
|
|
|
|
struct rusage __user *rusagep)
|
|
|
|
{
|
|
|
|
int retval = rusagep ? getrusage(p, RUSAGE_BOTH, rusagep) : 0;
|
2006-07-03 03:25:41 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
put_task_struct(p);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(SIGCHLD, &infop->si_signo);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_errno);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user((short)why, &infop->si_code);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(pid, &infop->si_pid);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(uid, &infop->si_uid);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(status, &infop->si_status);
|
|
|
|
if (!retval)
|
|
|
|
retval = pid;
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle sys_wait4 work for one task in state EXIT_ZOMBIE. We hold
|
|
|
|
* read_lock(&tasklist_lock) on entry. If we return zero, we still hold
|
|
|
|
* the lock and this task is uninteresting. If we return nonzero, we have
|
|
|
|
* released the lock and the system call should return.
|
|
|
|
*/
|
2008-03-19 22:24:59 -04:00
|
|
|
static int wait_task_zombie(struct task_struct *p, int options,
|
2005-04-16 18:20:36 -04:00
|
|
|
struct siginfo __user *infop,
|
|
|
|
int __user *stat_addr, struct rusage __user *ru)
|
|
|
|
{
|
|
|
|
unsigned long state;
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
int retval, status, traced;
|
2008-02-08 07:19:20 -05:00
|
|
|
pid_t pid = task_pid_vnr(p);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
if (!likely(options & WEXITED))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(options & WNOWAIT)) {
|
2005-04-16 18:20:36 -04:00
|
|
|
uid_t uid = p->uid;
|
|
|
|
int exit_code = p->exit_code;
|
|
|
|
int why, status;
|
|
|
|
|
|
|
|
get_task_struct(p);
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
if ((exit_code & 0x7f) == 0) {
|
|
|
|
why = CLD_EXITED;
|
|
|
|
status = exit_code >> 8;
|
|
|
|
} else {
|
|
|
|
why = (exit_code & 0x80) ? CLD_DUMPED : CLD_KILLED;
|
|
|
|
status = exit_code & 0x7f;
|
|
|
|
}
|
|
|
|
return wait_noreap_copyout(p, pid, uid, why,
|
|
|
|
status, infop, ru);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to move the task's state to DEAD
|
|
|
|
* only one thread is allowed to do this:
|
|
|
|
*/
|
|
|
|
state = xchg(&p->exit_state, EXIT_DEAD);
|
|
|
|
if (state != EXIT_ZOMBIE) {
|
|
|
|
BUG_ON(state != EXIT_DEAD);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-04-30 03:53:13 -04:00
|
|
|
traced = ptrace_reparented(p);
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
|
|
|
|
if (likely(!traced)) {
|
2006-01-09 23:54:39 -05:00
|
|
|
struct signal_struct *psig;
|
|
|
|
struct signal_struct *sig;
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* The resource counters for the group leader are in its
|
|
|
|
* own task_struct. Those for dead threads in the group
|
|
|
|
* are in its signal_struct, as are those for the child
|
|
|
|
* processes it has previously reaped. All these
|
|
|
|
* accumulate in the parent's signal_struct c* fields.
|
|
|
|
*
|
|
|
|
* We don't bother to take a lock here to protect these
|
|
|
|
* p->signal fields, because they are only touched by
|
|
|
|
* __exit_signal, which runs with tasklist_lock
|
|
|
|
* write-locked anyway, and so is excluded here. We do
|
|
|
|
* need to protect the access to p->parent->signal fields,
|
|
|
|
* as other threads in the parent group can be right
|
|
|
|
* here reaping other children at the same time.
|
|
|
|
*/
|
|
|
|
spin_lock_irq(&p->parent->sighand->siglock);
|
2006-01-09 23:54:39 -05:00
|
|
|
psig = p->parent->signal;
|
|
|
|
sig = p->signal;
|
|
|
|
psig->cutime =
|
|
|
|
cputime_add(psig->cutime,
|
2005-04-16 18:20:36 -04:00
|
|
|
cputime_add(p->utime,
|
2006-01-09 23:54:39 -05:00
|
|
|
cputime_add(sig->utime,
|
|
|
|
sig->cutime)));
|
|
|
|
psig->cstime =
|
|
|
|
cputime_add(psig->cstime,
|
2005-04-16 18:20:36 -04:00
|
|
|
cputime_add(p->stime,
|
2006-01-09 23:54:39 -05:00
|
|
|
cputime_add(sig->stime,
|
|
|
|
sig->cstime)));
|
2007-10-15 11:00:19 -04:00
|
|
|
psig->cgtime =
|
|
|
|
cputime_add(psig->cgtime,
|
|
|
|
cputime_add(p->gtime,
|
|
|
|
cputime_add(sig->gtime,
|
|
|
|
sig->cgtime)));
|
2006-01-09 23:54:39 -05:00
|
|
|
psig->cmin_flt +=
|
|
|
|
p->min_flt + sig->min_flt + sig->cmin_flt;
|
|
|
|
psig->cmaj_flt +=
|
|
|
|
p->maj_flt + sig->maj_flt + sig->cmaj_flt;
|
|
|
|
psig->cnvcsw +=
|
|
|
|
p->nvcsw + sig->nvcsw + sig->cnvcsw;
|
|
|
|
psig->cnivcsw +=
|
|
|
|
p->nivcsw + sig->nivcsw + sig->cnivcsw;
|
2007-05-11 01:22:37 -04:00
|
|
|
psig->cinblock +=
|
|
|
|
task_io_get_inblock(p) +
|
|
|
|
sig->inblock + sig->cinblock;
|
|
|
|
psig->coublock +=
|
|
|
|
task_io_get_oublock(p) +
|
|
|
|
sig->oublock + sig->coublock;
|
2008-07-27 11:29:15 -04:00
|
|
|
task_io_accounting_add(&psig->ioac, &p->ioac);
|
|
|
|
task_io_accounting_add(&psig->ioac, &sig->ioac);
|
2005-04-16 18:20:36 -04:00
|
|
|
spin_unlock_irq(&p->parent->sighand->siglock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now we are sure this task is interesting, and no other
|
|
|
|
* thread can reap it because we set its state to EXIT_DEAD.
|
|
|
|
*/
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
|
|
|
retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
|
|
|
|
status = (p->signal->flags & SIGNAL_GROUP_EXIT)
|
|
|
|
? p->signal->group_exit_code : p->exit_code;
|
|
|
|
if (!retval && stat_addr)
|
|
|
|
retval = put_user(status, stat_addr);
|
|
|
|
if (!retval && infop)
|
|
|
|
retval = put_user(SIGCHLD, &infop->si_signo);
|
|
|
|
if (!retval && infop)
|
|
|
|
retval = put_user(0, &infop->si_errno);
|
|
|
|
if (!retval && infop) {
|
|
|
|
int why;
|
|
|
|
|
|
|
|
if ((status & 0x7f) == 0) {
|
|
|
|
why = CLD_EXITED;
|
|
|
|
status >>= 8;
|
|
|
|
} else {
|
|
|
|
why = (status & 0x80) ? CLD_DUMPED : CLD_KILLED;
|
|
|
|
status &= 0x7f;
|
|
|
|
}
|
|
|
|
retval = put_user((short)why, &infop->si_code);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(status, &infop->si_status);
|
|
|
|
}
|
|
|
|
if (!retval && infop)
|
2008-02-08 07:19:07 -05:00
|
|
|
retval = put_user(pid, &infop->si_pid);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!retval && infop)
|
|
|
|
retval = put_user(p->uid, &infop->si_uid);
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
if (!retval)
|
2008-02-08 07:19:07 -05:00
|
|
|
retval = pid;
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
|
|
|
|
if (traced) {
|
2005-04-16 18:20:36 -04:00
|
|
|
write_lock_irq(&tasklist_lock);
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
/* We dropped tasklist, ptracer could die and untrace */
|
|
|
|
ptrace_unlink(p);
|
|
|
|
/*
|
|
|
|
* If this is not a detached task, notify the parent.
|
|
|
|
* If it's still not detached after that, don't release
|
|
|
|
* it now.
|
|
|
|
*/
|
2008-04-30 03:53:11 -04:00
|
|
|
if (!task_detached(p)) {
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
do_notify_parent(p, p->exit_signal);
|
2008-04-30 03:53:11 -04:00
|
|
|
if (!task_detached(p)) {
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
p->exit_state = EXIT_ZOMBIE;
|
|
|
|
p = NULL;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
write_unlock_irq(&tasklist_lock);
|
|
|
|
}
|
|
|
|
if (p != NULL)
|
|
|
|
release_task(p);
|
wait_task_zombie: fix 2/3 races vs forget_original_parent()
Two threads, T1 and T2. T2 ptraces P, and P is not a child of ptracer's
thread group. P exits and goes to TASK_ZOMBIE.
T1 does wait_task_zombie(P):
P->exit_state = TASK_DEAD;
...
read_unlock(&tasklist_lock);
T2 does exit(), takes tasklist,
forget_original_parent() does
__ptrace_unlink(P) but doesn't
call do_notify_parent(P) because
p->exit_state == EXIT_DEAD.
Now, P is not visible to our process: __ptrace_unlink() removed it from
->children. We should send notification to P->parent and release P if and
only if SIGCHLD is ignored.
And we have 3 bugs:
1. P->parent does do_wait() and gets -ECHILD (P is on ->parent->children,
but its state is TASK_DEAD).
2. // wait_task_zombie() continues
if (put_user(...)) {
// TODO: is this safe?
p->exit_state = EXIT_ZOMBIE;
return;
}
we return without notification/release, task_struct leaked.
Solution: ignore -EFAULT and proceed. It is an application's bug if
we can't fill infop/stat_addr (in case of VM_FAULT_OOM we have much
more problems).
3. // wait_task_zombie() continues
if (p->real_parent != p->parent) {
// Not taken, it was untraced'ed
...
}
release_task(p);
we released the task which we shouldn't.
Solution: check ->real_parent != ->parent before, under tasklist_lock,
but use ptrace_unlink() instead of __ptrace_unlink() to check ->ptrace.
This patch hopefully solves 2 and 3, the 1st bug will be fixed later, we need
some cleanups in forget_original_parent/reparent_thread.
However, the first race is very unlikely and not critical, so I hope it makes
sense to fix 1 and 2 for now.
4. Small cleanup: don't "restore" EXIT_ZOMBIE unless we know we are not going
to realease the child.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-17 02:26:58 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle sys_wait4 work for one task in state TASK_STOPPED. We hold
|
|
|
|
* read_lock(&tasklist_lock) on entry. If we return zero, we still hold
|
|
|
|
* the lock and this task is uninteresting. If we return nonzero, we have
|
|
|
|
* released the lock and the system call should return.
|
|
|
|
*/
|
2008-03-24 21:36:23 -04:00
|
|
|
static int wait_task_stopped(int ptrace, struct task_struct *p,
|
2008-03-19 22:24:59 -04:00
|
|
|
int options, struct siginfo __user *infop,
|
2005-04-16 18:20:36 -04:00
|
|
|
int __user *stat_addr, struct rusage __user *ru)
|
|
|
|
{
|
2008-02-08 07:19:01 -05:00
|
|
|
int retval, exit_code, why;
|
|
|
|
uid_t uid = 0; /* unneeded, required by compiler */
|
2007-11-28 19:21:24 -05:00
|
|
|
pid_t pid;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
if (!(options & WUNTRACED))
|
2008-03-19 22:24:59 -04:00
|
|
|
return 0;
|
|
|
|
|
2008-02-08 07:19:01 -05:00
|
|
|
exit_code = 0;
|
|
|
|
spin_lock_irq(&p->sighand->siglock);
|
|
|
|
|
|
|
|
if (unlikely(!task_is_stopped_or_traced(p)))
|
|
|
|
goto unlock_sig;
|
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
if (!ptrace && p->signal->group_stop_count > 0)
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* A group stop is in progress and this is the group leader.
|
|
|
|
* We won't report until all threads have stopped.
|
|
|
|
*/
|
2008-02-08 07:19:01 -05:00
|
|
|
goto unlock_sig;
|
|
|
|
|
|
|
|
exit_code = p->exit_code;
|
|
|
|
if (!exit_code)
|
|
|
|
goto unlock_sig;
|
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
if (!unlikely(options & WNOWAIT))
|
2008-02-08 07:19:01 -05:00
|
|
|
p->exit_code = 0;
|
|
|
|
|
|
|
|
uid = p->uid;
|
|
|
|
unlock_sig:
|
|
|
|
spin_unlock_irq(&p->sighand->siglock);
|
|
|
|
if (!exit_code)
|
2005-04-16 18:20:36 -04:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now we are pretty sure this task is interesting.
|
|
|
|
* Make sure it doesn't get reaped out from under us while we
|
|
|
|
* give up the lock and then examine it below. We don't want to
|
|
|
|
* keep holding onto the tasklist_lock while we call getrusage and
|
|
|
|
* possibly take page faults for user memory.
|
|
|
|
*/
|
|
|
|
get_task_struct(p);
|
2008-02-08 07:19:20 -05:00
|
|
|
pid = task_pid_vnr(p);
|
2008-03-24 21:36:23 -04:00
|
|
|
why = ptrace ? CLD_TRAPPED : CLD_STOPPED;
|
2005-04-16 18:20:36 -04:00
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
if (unlikely(options & WNOWAIT))
|
2005-04-16 18:20:36 -04:00
|
|
|
return wait_noreap_copyout(p, pid, uid,
|
2007-11-28 19:22:07 -05:00
|
|
|
why, exit_code,
|
2005-04-16 18:20:36 -04:00
|
|
|
infop, ru);
|
|
|
|
|
|
|
|
retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
|
|
|
|
if (!retval && stat_addr)
|
|
|
|
retval = put_user((exit_code << 8) | 0x7f, stat_addr);
|
|
|
|
if (!retval && infop)
|
|
|
|
retval = put_user(SIGCHLD, &infop->si_signo);
|
|
|
|
if (!retval && infop)
|
|
|
|
retval = put_user(0, &infop->si_errno);
|
|
|
|
if (!retval && infop)
|
2008-03-08 14:41:22 -05:00
|
|
|
retval = put_user((short)why, &infop->si_code);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!retval && infop)
|
|
|
|
retval = put_user(exit_code, &infop->si_status);
|
|
|
|
if (!retval && infop)
|
2007-11-28 19:21:24 -05:00
|
|
|
retval = put_user(pid, &infop->si_pid);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!retval && infop)
|
2008-02-08 07:19:01 -05:00
|
|
|
retval = put_user(uid, &infop->si_uid);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!retval)
|
2007-11-28 19:21:24 -05:00
|
|
|
retval = pid;
|
2005-04-16 18:20:36 -04:00
|
|
|
put_task_struct(p);
|
|
|
|
|
|
|
|
BUG_ON(!retval);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle do_wait work for one task in a live, non-stopped state.
|
|
|
|
* read_lock(&tasklist_lock) on entry. If we return zero, we still hold
|
|
|
|
* the lock and this task is uninteresting. If we return nonzero, we have
|
|
|
|
* released the lock and the system call should return.
|
|
|
|
*/
|
2008-03-19 22:24:59 -04:00
|
|
|
static int wait_task_continued(struct task_struct *p, int options,
|
2005-04-16 18:20:36 -04:00
|
|
|
struct siginfo __user *infop,
|
|
|
|
int __user *stat_addr, struct rusage __user *ru)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
pid_t pid;
|
|
|
|
uid_t uid;
|
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
if (!unlikely(options & WCONTINUED))
|
|
|
|
return 0;
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!(p->signal->flags & SIGNAL_STOP_CONTINUED))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
spin_lock_irq(&p->sighand->siglock);
|
|
|
|
/* Re-check with the lock held. */
|
|
|
|
if (!(p->signal->flags & SIGNAL_STOP_CONTINUED)) {
|
|
|
|
spin_unlock_irq(&p->sighand->siglock);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-03-19 22:24:59 -04:00
|
|
|
if (!unlikely(options & WNOWAIT))
|
2005-04-16 18:20:36 -04:00
|
|
|
p->signal->flags &= ~SIGNAL_STOP_CONTINUED;
|
|
|
|
spin_unlock_irq(&p->sighand->siglock);
|
|
|
|
|
2008-02-08 07:19:20 -05:00
|
|
|
pid = task_pid_vnr(p);
|
2005-04-16 18:20:36 -04:00
|
|
|
uid = p->uid;
|
|
|
|
get_task_struct(p);
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
|
|
|
if (!infop) {
|
|
|
|
retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
|
|
|
|
put_task_struct(p);
|
|
|
|
if (!retval && stat_addr)
|
|
|
|
retval = put_user(0xffff, stat_addr);
|
|
|
|
if (!retval)
|
2008-02-08 07:19:07 -05:00
|
|
|
retval = pid;
|
2005-04-16 18:20:36 -04:00
|
|
|
} else {
|
|
|
|
retval = wait_noreap_copyout(p, pid, uid,
|
|
|
|
CLD_CONTINUED, SIGCONT,
|
|
|
|
infop, ru);
|
|
|
|
BUG_ON(retval == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
/*
|
|
|
|
* Consider @p for a wait by @parent.
|
|
|
|
*
|
|
|
|
* -ECHILD should be in *@notask_error before the first call.
|
|
|
|
* Returns nonzero for a final return, when we have unlocked tasklist_lock.
|
|
|
|
* Returns zero if the search for a child should continue;
|
2008-03-30 21:41:25 -04:00
|
|
|
* then *@notask_error is 0 if @p is an eligible child,
|
|
|
|
* or another error from security_task_wait(), or still -ECHILD.
|
2008-03-19 22:24:59 -04:00
|
|
|
*/
|
2008-03-24 21:36:23 -04:00
|
|
|
static int wait_consider_task(struct task_struct *parent, int ptrace,
|
2008-03-19 22:24:59 -04:00
|
|
|
struct task_struct *p, int *notask_error,
|
|
|
|
enum pid_type type, struct pid *pid, int options,
|
|
|
|
struct siginfo __user *infop,
|
|
|
|
int __user *stat_addr, struct rusage __user *ru)
|
|
|
|
{
|
|
|
|
int ret = eligible_child(type, pid, options, p);
|
2008-03-30 21:41:25 -04:00
|
|
|
if (!ret)
|
2008-03-19 22:24:59 -04:00
|
|
|
return ret;
|
|
|
|
|
2008-03-30 21:41:25 -04:00
|
|
|
if (unlikely(ret < 0)) {
|
|
|
|
/*
|
|
|
|
* If we have not yet seen any eligible child,
|
|
|
|
* then let this error code replace -ECHILD.
|
|
|
|
* A permission error will give the user a clue
|
|
|
|
* to look for security policy problems, rather
|
|
|
|
* than for mysterious wait bugs.
|
|
|
|
*/
|
|
|
|
if (*notask_error)
|
|
|
|
*notask_error = ret;
|
|
|
|
}
|
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
if (likely(!ptrace) && unlikely(p->ptrace)) {
|
|
|
|
/*
|
|
|
|
* This child is hidden by ptrace.
|
|
|
|
* We aren't allowed to see it now, but eventually we will.
|
|
|
|
*/
|
|
|
|
*notask_error = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
if (p->exit_state == EXIT_DEAD)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We don't reap group leaders with subthreads.
|
|
|
|
*/
|
|
|
|
if (p->exit_state == EXIT_ZOMBIE && !delay_group_leader(p))
|
|
|
|
return wait_task_zombie(p, options, infop, stat_addr, ru);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It's stopped or running now, so it might
|
|
|
|
* later continue, exit, or stop again.
|
|
|
|
*/
|
|
|
|
*notask_error = 0;
|
|
|
|
|
|
|
|
if (task_is_stopped_or_traced(p))
|
2008-03-24 21:36:23 -04:00
|
|
|
return wait_task_stopped(ptrace, p, options,
|
|
|
|
infop, stat_addr, ru);
|
2008-03-19 22:24:59 -04:00
|
|
|
|
|
|
|
return wait_task_continued(p, options, infop, stat_addr, ru);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do the work of do_wait() for one thread in the group, @tsk.
|
|
|
|
*
|
|
|
|
* -ECHILD should be in *@notask_error before the first call.
|
|
|
|
* Returns nonzero for a final return, when we have unlocked tasklist_lock.
|
|
|
|
* Returns zero if the search for a child should continue; then
|
2008-03-30 21:41:25 -04:00
|
|
|
* *@notask_error is 0 if there were any eligible children,
|
|
|
|
* or another error from security_task_wait(), or still -ECHILD.
|
2008-03-19 22:24:59 -04:00
|
|
|
*/
|
|
|
|
static int do_wait_thread(struct task_struct *tsk, int *notask_error,
|
|
|
|
enum pid_type type, struct pid *pid, int options,
|
|
|
|
struct siginfo __user *infop, int __user *stat_addr,
|
|
|
|
struct rusage __user *ru)
|
|
|
|
{
|
|
|
|
struct task_struct *p;
|
|
|
|
|
|
|
|
list_for_each_entry(p, &tsk->children, sibling) {
|
2008-03-24 21:36:23 -04:00
|
|
|
/*
|
|
|
|
* Do not consider detached threads.
|
|
|
|
*/
|
|
|
|
if (!task_detached(p)) {
|
|
|
|
int ret = wait_consider_task(tsk, 0, p, notask_error,
|
|
|
|
type, pid, options,
|
|
|
|
infop, stat_addr, ru);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
2008-03-19 22:24:59 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ptrace_do_wait(struct task_struct *tsk, int *notask_error,
|
|
|
|
enum pid_type type, struct pid *pid, int options,
|
|
|
|
struct siginfo __user *infop, int __user *stat_addr,
|
|
|
|
struct rusage __user *ru)
|
|
|
|
{
|
|
|
|
struct task_struct *p;
|
|
|
|
|
|
|
|
/*
|
2008-03-24 21:36:23 -04:00
|
|
|
* Traditionally we see ptrace'd stopped tasks regardless of options.
|
2008-03-19 22:24:59 -04:00
|
|
|
*/
|
2008-03-24 21:36:23 -04:00
|
|
|
options |= WUNTRACED;
|
2008-03-19 22:24:59 -04:00
|
|
|
|
2008-03-24 21:36:23 -04:00
|
|
|
list_for_each_entry(p, &tsk->ptraced, ptrace_entry) {
|
|
|
|
int ret = wait_consider_task(tsk, 1, p, notask_error,
|
|
|
|
type, pid, options,
|
|
|
|
infop, stat_addr, ru);
|
|
|
|
if (ret)
|
2008-03-19 22:24:59 -04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:14 -05:00
|
|
|
static long do_wait(enum pid_type type, struct pid *pid, int options,
|
|
|
|
struct siginfo __user *infop, int __user *stat_addr,
|
|
|
|
struct rusage __user *ru)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
|
|
struct task_struct *tsk;
|
2008-03-19 22:24:59 -04:00
|
|
|
int retval;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
add_wait_queue(¤t->signal->wait_chldexit,&wait);
|
|
|
|
repeat:
|
2008-03-19 22:24:59 -04:00
|
|
|
/*
|
|
|
|
* If there is nothing that can match our critiera just get out.
|
|
|
|
* We will clear @retval to zero if we see any child that might later
|
|
|
|
* match our criteria, even if we are not able to reap it yet.
|
|
|
|
*/
|
2008-02-08 07:19:14 -05:00
|
|
|
retval = -ECHILD;
|
|
|
|
if ((type < PIDTYPE_MAX) && (!pid || hlist_empty(&pid->tasks[type])))
|
|
|
|
goto end;
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
current->state = TASK_INTERRUPTIBLE;
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
tsk = current;
|
|
|
|
do {
|
2008-03-19 22:24:59 -04:00
|
|
|
int tsk_result = do_wait_thread(tsk, &retval,
|
|
|
|
type, pid, options,
|
|
|
|
infop, stat_addr, ru);
|
|
|
|
if (!tsk_result)
|
|
|
|
tsk_result = ptrace_do_wait(tsk, &retval,
|
|
|
|
type, pid, options,
|
|
|
|
infop, stat_addr, ru);
|
|
|
|
if (tsk_result) {
|
|
|
|
/*
|
|
|
|
* tasklist_lock is unlocked and we have a final result.
|
|
|
|
*/
|
|
|
|
retval = tsk_result;
|
|
|
|
goto end;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
2008-03-19 22:24:59 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
if (options & __WNOTHREAD)
|
|
|
|
break;
|
|
|
|
tsk = next_thread(tsk);
|
2006-06-23 05:06:06 -04:00
|
|
|
BUG_ON(tsk->signal != current->signal);
|
2005-04-16 18:20:36 -04:00
|
|
|
} while (tsk != current);
|
|
|
|
read_unlock(&tasklist_lock);
|
2008-02-08 07:19:06 -05:00
|
|
|
|
2008-03-19 22:24:59 -04:00
|
|
|
if (!retval && !(options & WNOHANG)) {
|
2005-04-16 18:20:36 -04:00
|
|
|
retval = -ERESTARTSYS;
|
2008-03-19 22:24:59 -04:00
|
|
|
if (!signal_pending(current)) {
|
|
|
|
schedule();
|
|
|
|
goto repeat;
|
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
2008-03-19 22:24:59 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
end:
|
|
|
|
current->state = TASK_RUNNING;
|
|
|
|
remove_wait_queue(¤t->signal->wait_chldexit,&wait);
|
|
|
|
if (infop) {
|
|
|
|
if (retval > 0)
|
2008-02-08 07:19:02 -05:00
|
|
|
retval = 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* For a WNOHANG return, clear out all the fields
|
|
|
|
* we would set so the user can easily tell the
|
|
|
|
* difference.
|
|
|
|
*/
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_signo);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_errno);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_code);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_pid);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_uid);
|
|
|
|
if (!retval)
|
|
|
|
retval = put_user(0, &infop->si_status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:14 -05:00
|
|
|
asmlinkage long sys_waitid(int which, pid_t upid,
|
2005-04-16 18:20:36 -04:00
|
|
|
struct siginfo __user *infop, int options,
|
|
|
|
struct rusage __user *ru)
|
|
|
|
{
|
2008-02-08 07:19:14 -05:00
|
|
|
struct pid *pid = NULL;
|
|
|
|
enum pid_type type;
|
2005-04-16 18:20:36 -04:00
|
|
|
long ret;
|
|
|
|
|
|
|
|
if (options & ~(WNOHANG|WNOWAIT|WEXITED|WSTOPPED|WCONTINUED))
|
|
|
|
return -EINVAL;
|
|
|
|
if (!(options & (WEXITED|WSTOPPED|WCONTINUED)))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
switch (which) {
|
|
|
|
case P_ALL:
|
2008-02-08 07:19:14 -05:00
|
|
|
type = PIDTYPE_MAX;
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
case P_PID:
|
2008-02-08 07:19:14 -05:00
|
|
|
type = PIDTYPE_PID;
|
|
|
|
if (upid <= 0)
|
2005-04-16 18:20:36 -04:00
|
|
|
return -EINVAL;
|
|
|
|
break;
|
|
|
|
case P_PGID:
|
2008-02-08 07:19:14 -05:00
|
|
|
type = PIDTYPE_PGID;
|
|
|
|
if (upid <= 0)
|
2005-04-16 18:20:36 -04:00
|
|
|
return -EINVAL;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:14 -05:00
|
|
|
if (type < PIDTYPE_MAX)
|
|
|
|
pid = find_get_pid(upid);
|
|
|
|
ret = do_wait(type, pid, options, infop, NULL, ru);
|
|
|
|
put_pid(pid);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* avoid REGPARM breakage on x86: */
|
2008-04-10 18:37:38 -04:00
|
|
|
asmlinkage_protect(5, ret, which, upid, infop, options, ru);
|
2005-04-16 18:20:36 -04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-02-08 07:19:14 -05:00
|
|
|
asmlinkage long sys_wait4(pid_t upid, int __user *stat_addr,
|
2005-04-16 18:20:36 -04:00
|
|
|
int options, struct rusage __user *ru)
|
|
|
|
{
|
2008-02-08 07:19:14 -05:00
|
|
|
struct pid *pid = NULL;
|
|
|
|
enum pid_type type;
|
2005-04-16 18:20:36 -04:00
|
|
|
long ret;
|
|
|
|
|
|
|
|
if (options & ~(WNOHANG|WUNTRACED|WCONTINUED|
|
|
|
|
__WNOTHREAD|__WCLONE|__WALL))
|
|
|
|
return -EINVAL;
|
2008-02-08 07:19:14 -05:00
|
|
|
|
|
|
|
if (upid == -1)
|
|
|
|
type = PIDTYPE_MAX;
|
|
|
|
else if (upid < 0) {
|
|
|
|
type = PIDTYPE_PGID;
|
|
|
|
pid = find_get_pid(-upid);
|
|
|
|
} else if (upid == 0) {
|
|
|
|
type = PIDTYPE_PGID;
|
|
|
|
pid = get_pid(task_pgrp(current));
|
|
|
|
} else /* upid > 0 */ {
|
|
|
|
type = PIDTYPE_PID;
|
|
|
|
pid = find_get_pid(upid);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = do_wait(type, pid, options | WEXITED, NULL, stat_addr, ru);
|
|
|
|
put_pid(pid);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* avoid REGPARM breakage on x86: */
|
2008-04-10 18:37:38 -04:00
|
|
|
asmlinkage_protect(4, ret, upid, stat_addr, options, ru);
|
2005-04-16 18:20:36 -04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef __ARCH_WANT_SYS_WAITPID
|
|
|
|
|
|
|
|
/*
|
|
|
|
* sys_waitpid() remains for compatibility. waitpid() should be
|
|
|
|
* implemented by calling sys_wait4() from libc.a.
|
|
|
|
*/
|
|
|
|
asmlinkage long sys_waitpid(pid_t pid, int __user *stat_addr, int options)
|
|
|
|
{
|
|
|
|
return sys_wait4(pid, stat_addr, options, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|