From 84a924d297d04244e30a48344901bea2525417ad Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu Date: Wed, 23 Sep 2009 15:57:22 -0700 Subject: [PATCH] --- yaml --- r: 165703 b: refs/heads/master c: e5a4738699d6eca408dcb225bd350413927701e2 h: refs/heads/master i: 165701: 99847973f6b54f37520d7fe17ac8a677d4bad735 165699: 01f4cc9da5bc1cbdb0b05a1d2567e3e03bf150fd 165695: 97c7950f6dff9f79a587ac350dbfd5a51e78ade0 v: v3 --- [refs] | 2 +- trunk/kernel/pid_namespace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 12897e4e1131..284de31fa3df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 123be07b0b399670a7cc3d82fef0cb4f93ef885c +refs/heads/master: e5a4738699d6eca408dcb225bd350413927701e2 diff --git a/trunk/kernel/pid_namespace.c b/trunk/kernel/pid_namespace.c index 821722ae58a7..86b3796b0436 100644 --- a/trunk/kernel/pid_namespace.c +++ b/trunk/kernel/pid_namespace.c @@ -118,7 +118,7 @@ struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old { if (!(flags & CLONE_NEWPID)) return get_pid_ns(old_ns); - if (flags & CLONE_THREAD) + if (flags & (CLONE_THREAD|CLONE_PARENT)) return ERR_PTR(-EINVAL); return create_pid_namespace(old_ns); }