diff options
author | Oleg Nesterov <oleg@redhat.com> | 2014-04-02 11:45:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:20:21 -0400 |
commit | d23082257d83e4bc89727d5aedee197e907999d2 (patch) | |
tree | 4d8ada51919645b140b1ee5d25e2b37690d414fe /kernel/pid_namespace.c | |
parent | 7cbb39d4d4d530dff12f2ff06ed6c85c504ba91a (diff) |
pid_namespace: pidns_get() should check task_active_pid_ns() != NULL
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>
Diffstat (limited to 'kernel/pid_namespace.c')
-rw-r--r-- | kernel/pid_namespace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index 06c62de9c711..db95d8eb761b 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
@@ -318,7 +318,9 @@ static void *pidns_get(struct task_struct *task) | |||
318 | struct pid_namespace *ns; | 318 | struct pid_namespace *ns; |
319 | 319 | ||
320 | rcu_read_lock(); | 320 | rcu_read_lock(); |
321 | ns = get_pid_ns(task_active_pid_ns(task)); | 321 | ns = task_active_pid_ns(task); |
322 | if (ns) | ||
323 | get_pid_ns(ns); | ||
322 | rcu_read_unlock(); | 324 | rcu_read_unlock(); |
323 | 325 | ||
324 | return ns; | 326 | return ns; |