pid_namespace: pidns_get() should check task_active_pid_ns() != NULL
authorOleg Nesterov <oleg@redhat.com>
Wed, 2 Apr 2014 15:45:05 +0000 (17:45 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Apr 2014 23:20:21 +0000 (16:20 -0700)
pidns_get()->get_pid_ns() can hit ns == NULL. This task_struct can't
go away, but task_active_pid_ns(task) is NULL if release_task(task)
was already called. Alternatively we could change get_pid_ns(ns) to
check ns != NULL, but it seems that other callers are fine.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Eric W. Biederman ebiederm@xmission.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/pid_namespace.c

index 06c62de9c71191a68e5ea5b97bcb3a46b707a60d..db95d8eb761b4f92c4722a2667fb258e7e2b64c8 100644 (file)
@@ -318,7 +318,9 @@ static void *pidns_get(struct task_struct *task)
        struct pid_namespace *ns;
 
        rcu_read_lock();
-       ns = get_pid_ns(task_active_pid_ns(task));
+       ns = task_active_pid_ns(task);
+       if (ns)
+               get_pid_ns(ns);
        rcu_read_unlock();
 
        return ns;