Skip to contentSkip to conversation

pids: immprove get_task_pid() to fix the unsafe sys_wait4()->task_pgrp()

PATCH In review Oleg Nesterov 1 participant 1 message Jan 16, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 pids: immprove get_task_pid() to fix the unsafe sys_wait4()->task_pgrp()

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.

kernel/pid.c renamed from kernel/pid.c~SP_2_wait +2 -0
@@ -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;
kernel/exit.c renamed from kernel/exit.c~SP_2_wait +1 -1
@@ -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);