Skip to contentSkip to conversation

uts namespaces: Implement CLONE_NEWUTS flag

PATCH In review Serge E. Hallyn 1 participant 1 message May 10, 2006 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#1 lore raw

PATCH 9/9 uts namespaces: Implement CLONE_NEWUTS flag

In reply to a message not in the archive

Implement a CLONE_NEWUTS flag, and use it at clone and sys_unshare.

---

 include/linux/sched.h   |    1 +
 include/linux/utsname.h |    7 ++++++
 kernel/fork.c           |   13 ++++++++++--
 kernel/utsname.c        |   53 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 2 deletions(-)

7e24342145bbc63e7cdcc62a3729b9d89e3785db

include/linux/sched.h +1 -0
index 3332d5e..55671b2 100644
@@ -62,6 +62,7 @@ #define CLONE_DETACHED		0x00400000	/* Un
 #define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */
 #define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */
 #define CLONE_STOPPED		0x02000000	/* Start in stopped state */
+#define CLONE_NEWUTS		0x04000000	/* New utsname group? */
 
 /*
  * List of flags we want to share for kernel threads,
include/linux/utsname.h +7 -0
index 339ad14..b700911 100644
@@ -47,6 +47,8 @@ static inline void get_uts_ns(struct uts
 }
 
 #ifdef CONFIG_UTS_NS
+extern int unshare_utsname(unsigned long unshare_flags,
+				struct uts_namespace **new_uts);
 extern int copy_utsname(int flags, struct task_struct *tsk);
 extern void free_uts_ns(struct kref *kref);
 
@@ -64,6 +66,11 @@ static inline void exit_utsname(struct t
 }
 
 #else
+static inline int unshare_utsname(unsigned long unshare_flags,
+			struct uts_namespace **new_uts)
+{
+	return -EINVAL;
+}
 static inline int copy_utsname(int flags, struct task_struct *tsk)
 {
 	return 0;
kernel/fork.c +11 -2
index 4d7cbae..baeef86 100644
@@ -1570,13 +1570,14 @@ asmlinkage long sys_unshare(unsigned lon
 	struct files_struct *fd, *new_fd = NULL;
 	struct sem_undo_list *new_ulist = NULL;
 	struct nsproxy *new_nsproxy, *old_nsproxy;
+	struct uts_namespace *new_uts = NULL;
 
 	check_unshare_flags(&unshare_flags);
 
 	/* Return -EINVAL for all unsupported flags */
 	err = -EINVAL;
 	if (unshare_flags & ~(CLONE_THREAD|CLONE_FS|CLONE_NEWNS|CLONE_SIGHAND|
-				CLONE_VM|CLONE_FILES|CLONE_SYSVSEM))
+				CLONE_VM|CLONE_FILES|CLONE_SYSVSEM|CLONE_NEWUTS))
 		goto bad_unshare_out;
 
 	if ((err = unshare_thread(unshare_flags)))
@@ -1593,8 +1594,11 @@ asmlinkage long sys_unshare(unsigned lon
 		goto bad_unshare_cleanup_vm;
 	if ((err = unshare_semundo(unshare_flags, &new_ulist)))
 		goto bad_unshare_cleanup_fd;
+	if ((err = unshare_utsname(unshare_flags, &new_uts)))
+		goto bad_unshare_cleanup_fd;
 
-	if (new_fs || new_ns || new_sigh || new_mm || new_fd || new_ulist) {
+	if (new_fs || new_ns || new_sigh || new_mm || new_fd || new_ulist ||
+				new_uts) {
 
 		old_nsproxy = current->nsproxy;
 		new_nsproxy = clone_nsproxy(old_nsproxy);
@@ -1640,6 +1644,11 @@ asmlinkage long sys_unshare(unsigned lon
 			new_fd = fd;
 		}
 
+		if (new_uts) {
+			put_uts_ns(current->nsproxy->uts_ns);
+			current->nsproxy->uts_ns = new_uts;
+		}
+
 		task_unlock(current);
 	}
 
kernel/utsname.c +53 -0

71 lines not on this page · raw message

Signature · 1 line
1.3.0