Linux Container Development
 help / color / mirror / Atom feed
* [PATCH RFC] setns: return 0 directly if try to reassociate with current namespace
@ 2014-10-08  9:13 Chen Hanxiao
       [not found] ` <1412759587-21320-1-git-send-email-chenhanxiao-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Chen Hanxiao @ 2014-10-08  9:13 UTC (permalink / raw)
  To: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA
  Cc: Serge Hallyn, Eric W. Biederman

We could use setns to join the current ns,
which did a lot of unnecessary work.
This patch will check this senario and
return 0 directly.

Signed-off-by: Chen Hanxiao <chenhanxiao-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
---
 kernel/nsproxy.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index ef42d0a..66eea63 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -236,6 +236,34 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype)
 	ops = ei->ns_ops;
 	if (nstype && (ops->type != nstype))
 		goto out;
+	switch (ops->type) {
+	case CLONE_NEWIPC:
+		if (ei->ns == tsk->nsproxy->ipc_ns)
+			return 0;
+		break;
+	case CLONE_NEWNET:
+		if (ei->ns == tsk->nsproxy->net_ns)
+			return 0;
+		break;
+	case CLONE_NEWNS:
+		if (ei->ns == tsk->nsproxy->mnt_ns)
+			return 0;
+		break;
+	case CLONE_NEWPID:
+		if (ei->ns == tsk->nsproxy->pid_ns_for_children)
+			return 0;
+		break;
+	case CLONE_NEWUSER:
+		if (ei->ns == current_user_ns())
+			return 0;
+		break;
+	case CLONE_NEWUTS:
+		if (ei->ns == tsk->nsproxy->uts_ns)
+			return 0;
+		break;
+	default:
+		goto out;
+	}
 
 	new_nsproxy = create_new_namespaces(0, tsk, current_user_ns(), tsk->fs);
 	if (IS_ERR(new_nsproxy)) {
-- 
1.9.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-10-09  5:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-08  9:13 [PATCH RFC] setns: return 0 directly if try to reassociate with current namespace Chen Hanxiao
     [not found] ` <1412759587-21320-1-git-send-email-chenhanxiao-BthXqXjhjHXQFUHtdCDX3A@public.gmane.org>
2014-10-08 14:57   ` Serge Hallyn
2014-10-08 17:55     ` Eric W. Biederman
     [not found]       ` <87r3yih2e2.fsf-JOvCrm2gF+uungPnsOpG7nhyD016LWXt@public.gmane.org>
2014-10-08 20:13         ` Serge Hallyn
2014-10-09  4:14         ` Chen, Hanxiao
     [not found]           ` <5871495633F38949900D2BF2DC04883E5E0FAC-ZEd+hNNJ6a5ZYpXjqAkB5jz3u5zwRJJDAzI0kPv9QBlmR6Xm/wNWPw@public.gmane.org>
2014-10-09  5:52             ` Eric W. Biederman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox