Commit 6b03d130 authored Apr 19, 2020 by Eric W. Biederman

proc: Ensure we see the exit of each process tid exactly once

When the thread group leader changes during exec and the old leaders
thread is reaped proc_flush_pid will flush the dentries for the entire
process because the leader still has it's original pid.

Fix this by exchanging the pids in an rcu safe manner,
and wrapping the code to do that up in a helper exchange_tids.

When I removed switch_exec_pids and introduced this behavior
in d73d6529 ("[PATCH] pidhash: kill switch_exec_pids") there
really was nothing that cared as flushing happened with
the cached dentry and de_thread flushed both of them on exec.

This lack of fully exchanging pids became a problem a few months later
when I introduced 48e6484d ("[PATCH] proc: Rewrite the proc dentry
flush on exit optimization").  Which overlooked the de_thread case
was no longer swapping pids, and I was looking up proc dentries
by task->pid.

The current behavior isn't properly a bug as everything in proc will
continue to work correctly just a little bit less efficiently.  Fix
this just so there are no little surprise corner cases waiting to bite
people.

-- Oleg points out this could be an issue in next_tgid in proc where
   has_group_leader_pid is called, and reording some of the assignments
   should fix that.

-- Oleg points out this will break the 10 year old hack in __exit_signal.c
>	/*
>	 * This can only happen if the caller is de_thread().
>	 * FIXME: this is the temporary hack, we should teach
>	 * posix-cpu-timers to handle this case correctly.
>	 */
>	if (unlikely(has_group_leader_pid(tsk)))
>		posix_cpu_timers_exit_group(tsk);

The code in next_tgid has been changed to use PIDTYPE_TGID,
and the posix cpu timers code has been fixed so it does not
need the 10 year old hack, so this should be safe to merge
now.

Link: https://lore.kernel.org/lkml/87h7x3ajll.fsf_-_@x220.int.ebiederm.org/


Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Fixes: 48e6484d ("[PATCH] proc: Rewrite the proc dentry flush on exit optimization").
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

parent 35fc0e3b

fs/exec.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1186,11 +1186,8 @@ static int de_thread(struct task_struct *tsk)

		/* Become a process group leader with the old leader's pid.
		* The old leader becomes a thread of the this thread group.
		* Note: The old leader also uses this pid until release_task
		* is called. Odd but simple and correct.
		*/
		tsk->pid = leader->pid;
		change_pid(tsk, PIDTYPE_PID, task_pid(leader));
		exchange_tids(tsk, leader);
		transfer_pid(leader, tsk, PIDTYPE_TGID);
		transfer_pid(leader, tsk, PIDTYPE_PGID);
		transfer_pid(leader, tsk, PIDTYPE_SID);

include/linux/pid.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ extern void attach_pid(struct task_struct *task, enum pid_type);
		extern void detach_pid(struct task_struct *task, enum pid_type);
		extern void change_pid(struct task_struct *task, enum pid_type,
		struct pid *pid);
		extern void exchange_tids(struct task_struct task, struct task_struct old);
		extern void transfer_pid(struct task_struct old, struct task_struct new,
		enum pid_type);

kernel/pid.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,25 @@ void change_pid(struct task_struct *task, enum pid_type type,
		attach_pid(task, type);
		}

		void exchange_tids(struct task_struct left, struct task_struct right)
		{
		struct pid *pid1 = left->thread_pid;
		struct pid *pid2 = right->thread_pid;
		struct hlist_head *head1 = &pid1->tasks[PIDTYPE_PID];
		struct hlist_head *head2 = &pid2->tasks[PIDTYPE_PID];

		/* Swap the single entry tid lists */
		hlists_swap_heads_rcu(head1, head2);

		/* Swap the per task_struct pid */
		rcu_assign_pointer(left->thread_pid, pid2);
		rcu_assign_pointer(right->thread_pid, pid1);

		/* Swap the cached value */
		WRITE_ONCE(left->pid, pid_nr(pid2));
		WRITE_ONCE(right->pid, pid_nr(pid1));
		}

		/* transfer_pid is an optimization of attach_pid(new), detach_pid(old) */
		void transfer_pid(struct task_struct old, struct task_struct new,
		enum pid_type type)

Admin message