---

yaml --- r: 336037 b: refs/heads/master c: 05f5648 h: refs/heads/master i: 336035: 9d176b2 v: v3
git-mirror · Nov 27, 2012 · de0edb6 · de0edb6
1 parent 1a7c7c0
commit de0edb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56c176c9cac9a77249fa1736bfd792f379d61942
+refs/heads/master: 05f564849d49499ced97913a0914b5950577d07d
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
@@ -1877,8 +1877,9 @@ static struct dentry *proc_map_files_lookup(struct inode *dir,
 	if (!vma)
 		goto out_no_vma;
 
-	result = proc_map_files_instantiate(dir, dentry, task,
-			(void *)(unsigned long)vma->vm_file->f_mode);
+	if (vma->vm_file)
+		result = proc_map_files_instantiate(dir, dentry, task,
+				(void *)(unsigned long)vma->vm_file->f_mode);
 
 out_no_vma:
 	up_read(&mm->mmap_sem);