diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-29 18:51:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-29 18:51:17 +0100 |
| commit | 8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8 (patch) | |
| tree | 31f32c0d9a548f0dbbe9f3a32aca5767093d98b4 /fs/proc | |
| parent | net: ethernet: cpsw: fix build warnings for CPSW when CPTS not selected (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8.tar.xz linux-8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 3c231adf8450..9e28356a959a 100644 --- a/fs/proc/base.c +++ b/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); |