Commit 6f4e6433 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds
Browse files

pid namespaces: initialize the namespace's proc_mnt 



The namespace's proc_mnt must be kern_mount-ed to make this pointer always
valid, independently of whether the user space mounted the proc or not.  This
solves raced in proc_flush_task, etc.  with the proc_mnt switching from NULL
to not-NULL.

The initialization is done after the init's pid is created and hashed to make
proc_get_sb() finr it and get for root inode.

Sice the namespace holds the vfsmnt, vfsmnt holds the superblock and the
superblock holds the namespace we must explicitly break this circle to destroy
all the stuff.  This is done after the init of the namespace dies.  Running a
few steps forward - when init exits it will kill all its children, so no
proc_mnt will be needed after its death.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 130f77ec

fs/proc/base.c

+4 −0
Original line number Diff line number Diff line
@@ -2275,6 +2275,10 @@ void proc_flush_task(struct task_struct *task) 
		proc_flush_task_mnt(upid->ns->proc_mnt, upid->nr,

				leader ? 0 : tgid->numbers[i].nr);

	}



	upid = &pid->numbers[pid->level];

	if (upid->nr == 1)

		pid_ns_release_proc(upid->ns);

}



static struct dentry *proc_pid_instantiate(struct inode *dir,

fs/proc/root.c

+16 −0
Original line number Diff line number Diff line
@@ -212,6 +212,22 @@ struct proc_dir_entry proc_root = { 
	.parent		= &proc_root,

};



int pid_ns_prepare_proc(struct pid_namespace *ns)

{

	struct vfsmount *mnt;



	mnt = kern_mount_data(&proc_fs_type, ns);

	if (IS_ERR(mnt))

		return PTR_ERR(mnt);



	return 0;

}



void pid_ns_release_proc(struct pid_namespace *ns)

{

	mntput(ns->proc_mnt);

}



EXPORT_SYMBOL(proc_symlink);

EXPORT_SYMBOL(proc_mkdir);

EXPORT_SYMBOL(create_proc_entry);

include/linux/proc_fs.h

+12 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ extern const struct file_operations proc_kcore_operations; 
extern const struct file_operations proc_kmsg_operations;

extern const struct file_operations ppc_htab_operations;



extern int pid_ns_prepare_proc(struct pid_namespace *ns);

extern void pid_ns_release_proc(struct pid_namespace *ns);



/*

 * proc_tty.c

 */
@@ -235,6 +238,15 @@ static inline void proc_tty_unregister_driver(struct tty_driver *driver) {}; 


extern struct proc_dir_entry proc_root;



static inline int pid_ns_prepare_proc(struct pid_namespace *ns)

{

	return 0;

}



static inline void pid_ns_release_proc(struct pid_namespace *ns)

{

}



#endif /* CONFIG_PROC_FS */



#if !defined(CONFIG_PROC_KCORE)

kernel/fork.c

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/taskstats_kern.h>

#include <linux/random.h>

#include <linux/tty.h>

#include <linux/proc_fs.h>



#include <asm/pgtable.h>

#include <asm/pgalloc.h>
@@ -1150,6 +1151,12 @@ static struct task_struct *copy_process(unsigned long clone_flags, 
		pid = alloc_pid(task_active_pid_ns(p));

		if (!pid)

			goto bad_fork_cleanup_namespaces;



		if (clone_flags & CLONE_NEWPID) {

			retval = pid_ns_prepare_proc(task_active_pid_ns(p));

			if (retval < 0)

				goto bad_fork_free_pid;

		}

	}



	p->pid = pid_nr(pid);

CRA Git | Maintained and supported by SUSTech CRA and CCSE