Commit 5167246a authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

pidns: kill the unnecessary CLONE_NEWPID in copy_process()

Commit 8382fcac ("pidns: Outlaw thread creation after
unshare(CLONE_NEWPID)") nacks CLONE_NEWPID if the forking process
unshared pid_ns.  This is correct but unnecessary, copy_pid_ns() does
the same check.

Remove the CLONE_NEWPID check to cleanup the code and prepare for the
next change.

Test-case:

	static int child(void *arg)
	{
		return 0;
	}

	static char stack[16 * 1024];

	int main(void)
	{
		pid_t pid;

		assert(unshare(CLONE_NEWUSER | CLONE_NEWPID) == 0);

		pid = clone(child, stack + sizeof(stack) / 2,
				CLONE_NEWPID | SIGCHLD, NULL);
		assert(pid < 0 && errno == EINVAL);

		return 0;
	}

clone(CLONE_NEWPID) correctly fails with or without this change.
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarAndy Lutomirski <luto@amacapital.net>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Colin Walters <walters@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e79f525e
...@@ -1177,9 +1177,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, ...@@ -1177,9 +1177,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
* allow it to share a thread group or signal handlers with the * allow it to share a thread group or signal handlers with the
* forking task. * forking task.
*/ */
if ((clone_flags & (CLONE_SIGHAND | CLONE_NEWPID)) && if ((clone_flags & CLONE_SIGHAND) && (task_active_pid_ns(current) !=
(task_active_pid_ns(current) != current->nsproxy->pid_ns_for_children))
current->nsproxy->pid_ns_for_children))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
retval = security_task_create(clone_flags); retval = security_task_create(clone_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment