diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:52:42 -0400 |
commit | b194b4250c2b7e9d762823ac6045316fcd4bf4f9 (patch) | |
tree | 8c54b5004822958ef0a7603e76a4868582e26d7f /mm/fremap.c | |
parent | c4052da6f0c01a0b059d125d72bb934d0980b798 (diff) | |
parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
download | lwn-b194b4250c2b7e9d762823ac6045316fcd4bf4f9.tar.gz lwn-b194b4250c2b7e9d762823ac6045316fcd4bf4f9.zip |
Merge branch 'upstream'
Diffstat (limited to 'mm/fremap.c')
-rw-r--r-- | mm/fremap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/fremap.c b/mm/fremap.c index 3235fb77c133..ab23a0673c35 100644 --- a/mm/fremap.c +++ b/mm/fremap.c @@ -89,6 +89,9 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma, size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; if (!page->mapping || page->index >= size) goto err_unlock; + err = -ENOMEM; + if (page_mapcount(page) > INT_MAX/2) + goto err_unlock; zap_pte(mm, vma, addr, pte); |