aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam R. Howlett <Liam.Howlett@Oracle.com>2021-09-02 14:56:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-09-03 09:58:14 -0700
commit9b593cb20283e68e5e65b09ca10038935297f05b (patch)
tree610de4c811972336130633cc814d80ef6c3667fb
parentmm/pagemap: add mmap_assert_locked() annotations to find_vma*() (diff)
downloadlinux-dev-9b593cb20283e68e5e65b09ca10038935297f05b.tar.xz
linux-dev-9b593cb20283e68e5e65b09ca10038935297f05b.zip
remap_file_pages: Use vma_lookup() instead of find_vma()
Using vma_lookup() verifies the start address is contained in the found vma. This results in easier to read code. Link: https://lkml.kernel.org/r/20210817135234.1550204-1-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/mmap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 79f4f8ae43ec..52fed230dc21 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2994,14 +2994,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (mmap_write_lock_killable(mm))
return -EINTR;
- vma = find_vma(mm, start);
+ vma = vma_lookup(mm, start);
if (!vma || !(vma->vm_flags & VM_SHARED))
goto out;
- if (start < vma->vm_start)
- goto out;
-
if (start + size > vma->vm_end) {
struct vm_area_struct *next;