From b501be76075bf3204ef7942161a5160ab1953a26 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Fri, 20 Nov 2020 20:05:02 -0500 Subject: [PATCH] mm/mmap: Fix vm_pgoff in vma_shorten() Signed-off-by: Liam R. Howlett --- mm/mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2ff7ab8a6f61..ba1c78bdc519 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2684,7 +2684,7 @@ void vma_shorten(struct vm_area_struct *vma, unsigned long start, unmap->vm_end = old_end; unmap->vm_next = vma->vm_next; unmap->vm_prev = vma; - unmap->vm_pgoff += ((old_start - end) >> PAGE_SHIFT); + unmap->vm_pgoff += ((end - old_start) >> PAGE_SHIFT); } vma_adjust_trans_huge(vma, start, end, 0); @@ -2708,9 +2708,9 @@ void vma_shorten(struct vm_area_struct *vma, unsigned long start, vma_interval_tree_remove(vma, root); } - if (end == old_end) { // Altering the vm_start. - vma->vm_pgoff += (old_start - start) >> PAGE_SHIFT; + if (end == old_end) { vma->vm_start = start; + vma->vm_pgoff += (start - old_start) >> PAGE_SHIFT; } else { vma->vm_end = end; } -- 2.50.1