From: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx> Subject: [PATCH 7/7]: Enable cloning PTY namespaces Enable cloning PTY namespaces. Signed-off-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx> Signed-off-by: Serge Hallyn <serue@xxxxxxxxxx> Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx> --- fs/devpts/inode.c | 40 +++++++++++++++++++++++++++++++++++++++- include/linux/devpts_fs.h | 22 ++++++++++++++++++++-- include/linux/init_task.h | 1 + include/linux/nsproxy.h | 2 ++ include/linux/sched.h | 1 + kernel/fork.c | 2 +- kernel/nsproxy.c | 17 +++++++++++++++-- 7 files changed, 79 insertions(+), 6 deletions(-) Index: 2.6.25-rc5-mm1/include/linux/sched.h =================================================================== --- 2.6.25-rc5-mm1.orig/include/linux/sched.h 2008-03-24 20:02:57.000000000 -0700 +++ 2.6.25-rc5-mm1/include/linux/sched.h 2008-03-24 20:12:56.000000000 -0700 @@ -28,6 +28,7 @@ #define CLONE_NEWPID 0x20000000 /* New pid namespace */ #define CLONE_NEWNET 0x40000000 /* New network namespace */ #define CLONE_IO 0x80000000 /* Clone io context */ +#define CLONE_NEWPTS 0x0000000200000000ULL /* Clone pts ns */ /* * Scheduling policies Index: 2.6.25-rc5-mm1/include/linux/nsproxy.h =================================================================== --- 2.6.25-rc5-mm1.orig/include/linux/nsproxy.h 2008-03-24 20:02:57.000000000 -0700 +++ 2.6.25-rc5-mm1/include/linux/nsproxy.h 2008-03-24 20:12:56.000000000 -0700 @@ -8,6 +8,7 @@ struct mnt_namespace; struct uts_namespace; struct ipc_namespace; struct pid_namespace; +struct pts_namespace; /* * A structure to contain pointers to all per-process @@ -29,6 +30,7 @@ struct nsproxy { struct pid_namespace *pid_ns; struct user_namespace *user_ns; struct net *net_ns; + struct pts_namespace *pts_ns; }; extern struct nsproxy init_nsproxy; Index: 2.6.25-rc5-mm1/include/linux/init_task.h =================================================================== --- 2.6.25-rc5-mm1.orig/include/linux/init_task.h 2008-03-24 20:02:57.000000000 -0700 +++ 2.6.25-rc5-mm1/include/linux/init_task.h 2008-03-24 20:12:56.000000000 -0700 @@ -78,6 +78,7 @@ extern struct nsproxy init_nsproxy; .mnt_ns = NULL, \ INIT_NET_NS(net_ns) \ INIT_IPC_NS(ipc_ns) \ + .pts_ns = &init_pts_ns, \ .user_ns = &init_user_ns, \ } Index: 2.6.25-rc5-mm1/include/linux/devpts_fs.h =================================================================== --- 2.6.25-rc5-mm1.orig/include/linux/devpts_fs.h 2008-03-24 20:08:57.000000000 -0700 +++ 2.6.25-rc5-mm1/include/linux/devpts_fs.h 2008-03-24 20:12:56.000000000 -0700 @@ -66,7 +66,7 @@ static inline struct pts_namespace *pts_ static inline struct pts_namespace *current_pts_ns(void) { - return &init_pts_ns; + return current->nsproxy->pts_ns; } @@ -83,7 +83,8 @@ struct tty_struct *devpts_get_tty(struct /* unlink */ void devpts_pty_kill(struct pts_namespace *pts_ns, int number); -static inline void free_pts_ns(struct kref *ns_kref) { } +extern struct pts_namespace *new_pts_ns(void); +extern void free_pts_ns(struct kref *kref); static inline struct pts_namespace *get_pts_ns(struct pts_namespace *ns) { @@ -97,6 +98,15 @@ static inline void put_pts_ns(struct pts kref_put(&ns->kref, free_pts_ns); } +static inline struct pts_namespace *copy_pts_ns(u64 flags, + struct pts_namespace *old_ns) +{ + if (flags & CLONE_NEWPTS) + return new_pts_ns(); + else + return get_pts_ns(old_ns); +} + #else /* Dummy stubs in the no-pty case */ @@ -112,6 +122,14 @@ static inline struct pts_namespace *get_ } static inline void put_pts_ns(struct pts_namespace *ns) { } + +static inline struct pts_namespace *copy_pts_ns(u64 flags, + struct pts_namespace *old_ns) +{ + if (flags & CLONE_NEWPTS) + return ERR_PTR(-EINVAL); + return old_ns; +} #endif Index: 2.6.25-rc5-mm1/fs/devpts/inode.c =================================================================== --- 2.6.25-rc5-mm1.orig/fs/devpts/inode.c 2008-03-24 20:08:57.000000000 -0700 +++ 2.6.25-rc5-mm1/fs/devpts/inode.c 2008-03-24 20:14:20.000000000 -0700 @@ -27,6 +27,7 @@ extern int pty_limit; /* Config limit on Unix98 ptys */ static DECLARE_MUTEX(allocated_ptys_lock); +static struct file_system_type devpts_fs_type; static struct { int setuid; @@ -56,6 +57,43 @@ struct pts_namespace init_pts_ns = { .mnt = NULL, }; +struct pts_namespace *new_pts_ns(void) +{ + struct pts_namespace *ns; + + ns = kmalloc(sizeof(*ns), GFP_KERNEL); + if (!ns) + return ERR_PTR(-ENOMEM); + + kref_init(&ns->kref); + + ns->mnt = kern_mount_data(&devpts_fs_type, ns); + if (IS_ERR(ns->mnt)) { + kfree(ns); + return ERR_PTR(PTR_ERR(ns->mnt)); + } + + idr_init(&ns->allocated_ptys); + ns->user_mounted = 0; + + return ns; +} + +void free_pts_ns(struct kref *ns_kref) +{ + struct pts_namespace *ns; + + ns = container_of(ns_kref, struct pts_namespace, kref); + mntput(ns->mnt); + + /* + * TODO: + * idr_remove_all(&ns->allocated_ptys); introduced in 2.6.23 + */ + idr_destroy(&ns->allocated_ptys); + kfree(ns); +} + static int devpts_remount(struct super_block *sb, int *flags, char *data) { @@ -194,7 +232,7 @@ static int devpts_get_sb(struct file_sys if (flags & MS_KERNMOUNT) ns = data; else - ns = &init_pts_ns; + ns = current_pts_ns(); /* hereafter we're very simlar to get_sb_nodev */ sb = sget(fs_type, devpts_test_sb, devpts_set_sb, ns); Index: 2.6.25-rc5-mm1/kernel/fork.c =================================================================== --- 2.6.25-rc5-mm1.orig/kernel/fork.c 2008-03-24 20:02:57.000000000 -0700 +++ 2.6.25-rc5-mm1/kernel/fork.c 2008-03-24 20:12:56.000000000 -0700 @@ -1713,7 +1713,7 @@ static long do_unshare(u64 unshare_flags if (unshare_flags & ~(CLONE_THREAD|CLONE_FS|CLONE_NEWNS|CLONE_SIGHAND| CLONE_VM|CLONE_FILES|CLONE_SYSVSEM| CLONE_NEWUTS|CLONE_NEWIPC|CLONE_NEWUSER| - CLONE_NEWNET)) + CLONE_NEWNET|CLONE_NEWPTS)) goto bad_unshare_out; if ((err = unshare_thread(unshare_flags))) Index: 2.6.25-rc5-mm1/kernel/nsproxy.c =================================================================== --- 2.6.25-rc5-mm1.orig/kernel/nsproxy.c 2008-03-24 20:02:57.000000000 -0700 +++ 2.6.25-rc5-mm1/kernel/nsproxy.c 2008-03-24 20:12:56.000000000 -0700 @@ -21,6 +21,7 @@ #include <linux/utsname.h> #include <linux/pid_namespace.h> #include <net/net_namespace.h> +#include <linux/devpts_fs.h> #include <linux/ipc_namespace.h> static struct kmem_cache *nsproxy_cachep; @@ -93,8 +94,17 @@ static struct nsproxy *create_new_namesp goto out_net; } + new_nsp->pts_ns = copy_pts_ns(flags, tsk->nsproxy->pts_ns); + if (IS_ERR(new_nsp->pts_ns)) { + err = PTR_ERR(new_nsp->pts_ns); + goto out_pts; + } + return new_nsp; +out_pts: + if (new_nsp->net_ns) + put_net(new_nsp->net_ns); out_net: if (new_nsp->user_ns) put_user_ns(new_nsp->user_ns); @@ -131,7 +141,8 @@ int copy_namespaces(u64 flags, struct ta get_nsproxy(old_ns); if (!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | - CLONE_NEWUSER | CLONE_NEWPID | CLONE_NEWNET))) + CLONE_NEWUSER | CLONE_NEWPID | CLONE_NEWNET | + CLONE_NEWPTS))) return 0; if (!capable(CAP_SYS_ADMIN)) { @@ -170,6 +181,8 @@ void free_nsproxy(struct nsproxy *ns) put_pid_ns(ns->pid_ns); if (ns->user_ns) put_user_ns(ns->user_ns); + if (ns->pts_ns) + put_pts_ns(ns->pts_ns); put_net(ns->net_ns); kmem_cache_free(nsproxy_cachep, ns); } @@ -184,7 +197,7 @@ int unshare_nsproxy_namespaces(u64 unsha int err = 0; if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | - CLONE_NEWUSER | CLONE_NEWNET))) + CLONE_NEWUSER | CLONE_NEWNET | CLONE_NEWPTS))) return 0; if (!capable(CAP_SYS_ADMIN)) _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers