From: Liam R. Howlett Date: Mon, 4 Jan 2021 20:03:49 +0000 (-0500) Subject: mm/mremap: Use vma_find_intersection() instead of vma linked list X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ef9a86c7379389f051a7bf1e64cf136804e34ab8;p=users%2Fjedix%2Flinux-maple.git mm/mremap: Use vma_find_intersection() instead of vma linked list Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka --- diff --git a/mm/mremap.c b/mm/mremap.c index ccf8f4fe6f5f..fc7b8c88474a 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -713,7 +713,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, if (excess) { vma->vm_flags |= VM_ACCOUNT; if (split) - vma->vm_next->vm_flags |= VM_ACCOUNT; + find_vma(mm, vma->vm_end)->vm_flags |= VM_ACCOUNT; } return new_addr; @@ -869,9 +869,10 @@ out: static int vma_expandable(struct vm_area_struct *vma, unsigned long delta) { unsigned long end = vma->vm_end + delta; + if (end < vma->vm_end) /* overflow */ return 0; - if (vma->vm_next && vma->vm_next->vm_start < end) /* intersection */ + if (find_vma_intersection(vma->vm_mm, vma->vm_end, end)) return 0; if (get_unmapped_area(NULL, vma->vm_start, end - vma->vm_start, 0, MAP_FIXED) & ~PAGE_MASK)