1 files changed, 16 insertions, 4 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 77a57b5799c4..1a979ea3b379 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -371,9 +371,11 @@ static int mounts_open(struct inode *inode, struct file *file)
 
         if (task) {
                 task_lock(task);
-                ns = task->nsproxy->mnt_ns;
-                if (ns)
-                        get_mnt_ns(ns);
+                if (task->nsproxy) {
+                        ns = task->nsproxy->mnt_ns;
+                        if (ns)
+                                get_mnt_ns(ns);
+                }
                 task_unlock(task);
                 put_task_struct(task);
         }
@@ -2326,13 +2328,23 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi
 {
         struct dentry *dentry = filp->f_path.dentry;
         struct inode *inode = dentry->d_inode;
-        struct task_struct *leader = get_proc_task(inode);
+        struct task_struct *leader = NULL;
         struct task_struct *task;
         int retval = -ENOENT;
         ino_t ino;
         int tid;
         unsigned long pos = filp->f_pos;  /* avoiding "long long" filp->f_pos */
 
+        task = get_proc_task(inode);
+        if (!task)
+                goto out_no_task;
+        rcu_read_lock();
+        if (pid_alive(task)) {
+                leader = task->group_leader;
+                get_task_struct(leader);
+        }
+        rcu_read_unlock();
+        put_task_struct(task);
         if (!leader)
                 goto out_no_task;
         retval = 0;