From de0edb6905fc6b6cab05d21e52eb229086b3942c Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Mon, 26 Nov 2012 16:29:42 -0800 Subject: [PATCH] --- yaml --- r: 336037 b: refs/heads/master c: 05f564849d49499ced97913a0914b5950577d07d h: refs/heads/master i: 336035: 9d176b252513e55237905e43925b176679dfaadc v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3560fb3f98cb..28e6f58c10fa 100644 --- 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 index 3c231adf8450..9e28356a959a 100644 --- 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);