Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

romfs: fix romfs_get_unmapped_area() argument check

Browse source 
romfs_get_unmapped_area() checks argument `len' without considering
PAGE_ALIGN which will cause do_mmap_pgoff() return -EINVAL error after
commit f67d9b1576 ("nommu: add page_align to mmap").

Fix the check by changing it in same way ramfs_nommu_get_unmapped_area()
was changed in ramfs/file-nommu.c.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: Greg Ungerer <gerg@snapgear.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Bob Liu 2011-06-27 16:18:06 -07:00 committed by Linus Torvalds
parent 8c95aa60d2
commit 2b4b2482e7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/romfs/mmap-nommu.c
View file

@ -27,14 +27,18 @@ static unsigned long romfs_get_unmapped_area(struct file *file,
{ {
struct inode *inode = file->f_mapping->host; struct inode *inode = file->f_mapping->host;
struct mtd_info *mtd = inode->i_sb->s_mtd; struct mtd_info *mtd = inode->i_sb->s_mtd;
unsigned long isize, offset; unsigned long isize, offset, maxpages, lpages;
if (!mtd) if (!mtd)
goto cant_map_directly; goto cant_map_directly;
/* the mapping mustn't extend beyond the EOF */
lpages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
isize = i_size_read(inode); isize = i_size_read(inode);
offset = pgoff << PAGE_SHIFT; offset = pgoff << PAGE_SHIFT;
if (offset > isize || len > isize || offset > isize - len)
maxpages = (isize + PAGE_SIZE - 1) >> PAGE_SHIFT;
if ((pgoff >= maxpages) || (maxpages - pgoff < lpages))
return (unsigned long) -EINVAL; return (unsigned long) -EINVAL;
/* we need to call down to the MTD layer to do the actual mapping */ /* we need to call down to the MTD layer to do the actual mapping */