diff options
author | Gavin Lambert <gavinl@compacsort.com> | 2006-10-01 02:27:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:17 -0400 |
commit | 3fcd03e07008ec0f667dfb7626171165699ea5c2 (patch) | |
tree | 311370abb953013b7ffa458b63b376706560061e | |
parent | ab8e92efcf3f7972f30033cad75f180aef4f3abc (diff) |
[PATCH] NOMMU: don't try and give NULL to fput()
Don't try and give NULL to fput() in the error handling in do_mmap_pgoff()
as it'll cause an oops.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | mm/nommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 564540662192..365019599df8 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -948,7 +948,8 @@ unsigned long do_mmap_pgoff(struct file *file, | |||
948 | up_write(&nommu_vma_sem); | 948 | up_write(&nommu_vma_sem); |
949 | kfree(vml); | 949 | kfree(vml); |
950 | if (vma) { | 950 | if (vma) { |
951 | fput(vma->vm_file); | 951 | if (vma->vm_file) |
952 | fput(vma->vm_file); | ||
952 | kfree(vma); | 953 | kfree(vma); |
953 | } | 954 | } |
954 | return ret; | 955 | return ret; |