aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/pid_namespace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/pid_namespace.c')
-rw-r--r--kernel/pid_namespace.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 495d5dea22b2..821722ae58a7 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -116,23 +116,11 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
116 116
117struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns) 117struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
118{ 118{
119 struct pid_namespace *new_ns;
120
121 BUG_ON(!old_ns);
122 new_ns = get_pid_ns(old_ns);
123 if (!(flags & CLONE_NEWPID)) 119 if (!(flags & CLONE_NEWPID))
124 goto out; 120 return get_pid_ns(old_ns);
125
126 new_ns = ERR_PTR(-EINVAL);
127 if (flags & CLONE_THREAD) 121 if (flags & CLONE_THREAD)
128 goto out_put; 122 return ERR_PTR(-EINVAL);
129 123 return create_pid_namespace(old_ns);
130 new_ns = create_pid_namespace(old_ns);
131
132out_put:
133 put_pid_ns(old_ns);
134out:
135 return new_ns;
136} 124}
137 125
138void free_pid_ns(struct kref *kref) 126void free_pid_ns(struct kref *kref)