Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/proc/task_nommu.c: don't use priv->task->mm

I do not know if CONFIG_PREEMPT/SMP is possible without CONFIG_MMU
but the usage of task->mm in m_stop(). The task can exit/exec before
we take mmap_sem, in this case m_stop() can hit NULL or unlock the
wrong rw_semaphore.

Also, this code uses priv->task != NULL to decide whether we need
up_read/mmput. This is correct, but we will probably kill priv->task.
Change m_start/m_stop to rely on IS_ERR_OR_NULL() like task_mmu.c does.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Oleg Nesterov and committed by
Linus Torvalds
47fecca1 27692cd5

+10 -8
+10 -8
fs/proc/task_nommu.c
··· 217 217 return ERR_PTR(-ESRCH); 218 218 219 219 mm = priv->mm; 220 - if (!mm || !atomic_inc_not_zero(&mm->mm_users)) { 221 - put_task_struct(priv->task); 222 - priv->task = NULL; 220 + if (!mm || !atomic_inc_not_zero(&mm->mm_users)) 223 221 return NULL; 224 - } 225 - down_read(&mm->mmap_sem); 226 222 223 + down_read(&mm->mmap_sem); 227 224 /* start from the Nth VMA */ 228 225 for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) 229 226 if (n-- == 0) 230 227 return p; 228 + 229 + up_read(&mm->mmap_sem); 230 + mmput(mm); 231 231 return NULL; 232 232 } 233 233 ··· 235 235 { 236 236 struct proc_maps_private *priv = m->private; 237 237 238 + if (!IS_ERR_OR_NULL(_vml)) { 239 + up_read(&priv->mm->mmap_sem); 240 + mmput(priv->mm); 241 + } 238 242 if (priv->task) { 239 - struct mm_struct *mm = priv->task->mm; 240 - up_read(&mm->mmap_sem); 241 - mmput(mm); 242 243 put_task_struct(priv->task); 244 + priv->task = NULL; 243 245 } 244 246 } 245 247