Skip to contentSkip to conversation

fix the "remove task_ppid_nr_ns" commit

PATCH In review Oleg Nesterov 2 participants 2 messages Jan 14, 2008 Proc filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix the "remove task_ppid_nr_ns" commit

The commit 84427eaef1fb91704c7112bdb598c810003b99f3 (remove task_ppid_nr_ns) moves the task_tgid_nr_ns(task->real_parent) outside of lock_task_sighand(). This is wrong, ->real_parent could be freed/reused.

Both ->parent/real_parent point to nothnig after __exit_signal() because we remove the child from ->children list, and thus the child can't be reparented when its parent exits.

rcu_read_lock() protects ->parent/real_parent, but _only_ if we know it was valid before we take rcu lock.

Revert this part of the patch.

fs/proc/array.c renamed from fs/proc/array.c~ppid_fix +1 -1
@@ -426,7 +426,6 @@ static int do_task_stat(struct task_stru
 	cgtime = gtime = cputime_zero;
 
 	rcu_read_lock();
-	ppid = task_tgid_nr_ns(task->real_parent, ns);
 	if (lock_task_sighand(task, &flags)) {
 		struct signal_struct *sig = task->signal;
 
@@ -465,6 +464,7 @@ static int do_task_stat(struct task_stru
 		}
 
 		sid = task_session_nr_ns(task, ns);
+		ppid = task_tgid_nr_ns(task->real_parent, ns);
 		pgid = task_pgrp_nr_ns(task, ns);
 
 		unlock_task_sighand(task, &flags);
#1 lore raw

This preserves the parts of my change that mattered, is correctly more conservative than my change was, and is fine with me.

Thanks,
Roland