From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Mon, 1 Mar 2021 19:23:26 +0000 (-0500)
Subject: mm/mmap: Fix mmap_region() maple state
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86cb25bbd697d88335d56b30074093a78fd7619a;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Fix mmap_region() maple state

When finding next, tmp must be reset to mas to ensure the correct slot is
used for writing

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index 0767553aa7bcf..73fc95a10c8d3 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2561,6 +2561,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 			merge_end = next->vm_end;
 			vma = next;
 			vm_pgoff = next->vm_pgoff - pglen;
+			tmp = mas;
 		}
 	}