[PATCH 2/3] pids: immprove get_task_pid() to fix the unsafesys_wait4()->task_pgrp()

From: Oleg Nesterov
Date: Fri Jan 16 2009 - 00:57:48 EST


sys_wait4() does get_pid(task_pgrp(current)), this is not safe. We can
add rcu lock/unlock around, but we already have get_task_pid() which can
be improved to handle the special pids in more reliable manner.

Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>

--- CUR/kernel/pid.c~SP_2_wait 2009-01-12 23:07:49.000000000 +0100
+++ CUR/kernel/pid.c 2009-01-16 02:54:26.000000000 +0100
@@ -403,6 +403,8 @@ struct pid *get_task_pid(struct task_str
{
struct pid *pid;
rcu_read_lock();
+ if (type != PIDTYPE_PID)
+ task = task->group_leader;
pid = get_pid(task->pids[type].pid);
rcu_read_unlock();
return pid;
--- CUR/kernel/exit.c~SP_2_wait 2009-01-12 23:07:49.000000000 +0100
+++ CUR/kernel/exit.c 2009-01-16 02:51:48.000000000 +0100
@@ -1811,7 +1811,7 @@ asmlinkage long sys_wait4(pid_t upid, in
pid = find_get_pid(-upid);
} else if (upid == 0) {
type = PIDTYPE_PGID;
- pid = get_pid(task_pgrp(current));
+ pid = get_task_pid(current, PIDTYPE_PGID);
} else /* upid > 0 */ {
type = PIDTYPE_PID;
pid = find_get_pid(upid);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/