diff --git a/[refs] b/[refs] index 15fd562ffa84..6479f831c01e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab8e92efcf3f7972f30033cad75f180aef4f3abc +refs/heads/master: 3fcd03e07008ec0f667dfb7626171165699ea5c2 diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c index 564540662192..365019599df8 100644 --- a/trunk/mm/nommu.c +++ b/trunk/mm/nommu.c @@ -948,7 +948,8 @@ unsigned long do_mmap_pgoff(struct file *file, up_write(&nommu_vma_sem); kfree(vml); if (vma) { - fput(vma->vm_file); + if (vma->vm_file) + fput(vma->vm_file); kfree(vma); } return ret;