Merge tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu into fixes

[sfrench/cifs-2.6.git] / kernel / pid_namespace.c

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 74a5a7255b4d9cb473cc7708d851c64402cca942..4918314893bc6620ae95660c78588d6d5ac9129c 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -101,6 +101,10 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
        int i;
        int err;
 
+       err = -EINVAL;
+       if (!in_userns(parent_pid_ns->user_ns, user_ns))
+               goto out;
+
        err = -ENOSPC;
        if (level > MAX_PID_NS_LEVEL)
                goto out;