Commit 84427eae authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

remove task_ppid_nr_ns 



task_ppid_nr_ns is called in three places.  One of these should never
have called it.  In the other two, using it broke the existing
semantics.  This was presumably accidental.  If the function had not
been there, it would have been much more obvious to the eye that those
patches were changing the behavior.  We don't need this function.

In task_state, the pid of the ptracer is not the ppid of the ptracer.

In do_task_stat, ppid is the tgid of the real_parent, not its pid.
I also moved the call outside of lock_task_sighand, since it doesn't
need it.

In sys_getppid, ppid is the tgid of the real_parent, not its pid.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 974a9f0b

fs/proc/array.c

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static inline char *task_state(struct task_struct *p, char *buffer) 
	ppid = pid_alive(p) ?

		task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;

	tpid = pid_alive(p) && p->ptrace ?

		task_ppid_nr_ns(rcu_dereference(p->parent), ns) : 0;

		task_pid_nr_ns(rcu_dereference(p->parent), ns) : 0;

	buffer += sprintf(buffer,

		"State:\t%s\n"

		"Tgid:\t%d\n"
@@ -426,6 +426,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) 
	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,7 +466,6 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) 


		sid = task_session_nr_ns(task, ns);

		pgid = task_pgrp_nr_ns(task, ns);

		ppid = task_ppid_nr_ns(task, ns);



		unlock_task_sighand(task, &flags);

	}

include/linux/sched.h

+0 −13
Original line number Diff line number Diff line
@@ -1255,13 +1255,6 @@ struct pid_namespace; 
 *

 * set_task_vxid()   : assigns a virtual id to a task;

 *

 * task_ppid_nr_ns() : the parent's id as seen from the namespace specified.

 *                     the result depends on the namespace and whether the

 *                     task in question is the namespace's init. e.g. for the

 *                     namespace's init this will return 0 when called from

 *                     the namespace of this init, or appropriate id otherwise.

 *

 *

 * see also pid_nr() etc in include/linux/pid.h

 */
@@ -1317,12 +1310,6 @@ static inline pid_t task_session_vnr(struct task_struct *tsk) 
}





static inline pid_t task_ppid_nr_ns(struct task_struct *tsk,

		struct pid_namespace *ns)

{

	return pid_nr_ns(task_pid(rcu_dereference(tsk->real_parent)), ns);

}



/**

 * pid_alive - check that a task structure is not stale

 * @p: Task structure to be checked.

kernel/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ asmlinkage long sys_getppid(void) 
	int pid;



	rcu_read_lock();

	pid = task_ppid_nr_ns(current, current->nsproxy->pid_ns);

	pid = task_tgid_nr_ns(current->real_parent, current->nsproxy->pid_ns);

	rcu_read_unlock();



	return pid;

CRA Git | Maintained and supported by SUSTech CRA and CCSE