Linux 3.14

[~andy/linux] / fs / proc_namespace.c

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 439406e081af903a298f6305d9e7c1d744b58813..7be26f03a3f5813ed501bea520e79041af4466f7 100644 (file)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -234,17 +234,12 @@ static int mounts_open_common(struct inode *inode, struct file *file,
 
        rcu_read_lock();
        nsp = task_nsproxy(task);
-       if (!nsp) {
+       if (!nsp || !nsp->mnt_ns) {
                rcu_read_unlock();
                put_task_struct(task);
                goto err;
        }
        ns = nsp->mnt_ns;
-       if (!ns) {
-               rcu_read_unlock();
-               put_task_struct(task);
-               goto err;
-       }
        get_mnt_ns(ns);
        rcu_read_unlock();
        task_lock(task);