Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2b4b2482e70eba10dd98653a3a5ac68126565e24

Authored by Bob Liu
Committed by Linus Torvalds
1 parent 8c95aa60d2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

romfs: fix romfs_get_unmapped_area() argument check 

romfs_get_unmapped_area() checks argument `len' without considering
PAGE_ALIGN which will cause do_mmap_pgoff() return -EINVAL error after
commit f67d9b1576c ("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>

Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff

fs/romfs/mmap-nommu.c
Diff comments   View file @ 2b4b248
... ... @@ -27,14 +27,18 @@
27 27 {
28 28 struct inode *inode = file->f_mapping->host;
29 29 struct mtd_info *mtd = inode->i_sb->s_mtd;
30   - unsigned long isize, offset;
  30 + unsigned long isize, offset, maxpages, lpages;
31 31  
32 32 if (!mtd)
33 33 goto cant_map_directly;
34 34  
  35 + /* the mapping mustn't extend beyond the EOF */
  36 + lpages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
35 37 isize = i_size_read(inode);
36 38 offset = pgoff << PAGE_SHIFT;
37   - if (offset > isize || len > isize || offset > isize - len)
  39 +
  40 + maxpages = (isize + PAGE_SIZE - 1) >> PAGE_SHIFT;
  41 + if ((pgoff >= maxpages) || (maxpages - pgoff < lpages))
38 42 return (unsigned long) -EINVAL;
39 43  
40 44 /* we need to call down to the MTD layer to do the actual mapping */