Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace (b2768df2) · Commits · 戴 / test

Pull pid leak fix from Eric Biederman: "Oleg noticed that put_pid(thread_pid) was not getting called when proc was not compiled in. Let's get that fixed before 5.7 is released and causes problems for anyone" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: proc: Put thread_pid in release_task not proc_flush_pid

fs/proc/base.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -3286,7 +3286,6 @@ static const struct inode_operations proc_tgid_base_inode_operations = {
		void proc_flush_pid(struct pid *pid)
		{
		proc_invalidate_siblings_dcache(&pid->inodes, &pid->lock);
		put_pid(pid);
		}

		static struct dentry proc_pid_instantiate(struct dentry dentry,

kernel/exit.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,7 @@ repeat:

		write_unlock_irq(&tasklist_lock);
		proc_flush_pid(thread_pid);
		put_pid(thread_pid);
		release_thread(p);
		put_task_struct_rcu_user(p);

Admin message