From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 29 Jan 2021 14:41:00 +0000 (-0500)
Subject: mm/mmap: Validate code fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=35355b09de2dbcaa06dde900d9578c330a0d6d3d;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Validate code fix

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

diff --git a/mm/mmap.c b/mm/mmap.c
index c1e68091a05c..7a79a8b5e3ad 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -298,7 +298,6 @@ out:
 extern void mt_validate(struct maple_tree *mt);
 extern void mt_dump(const struct maple_tree *mt);
 
-/* Validate the maple tree */
 static void validate_mm(struct mm_struct *mm)
 {
 	int bug = 0;
@@ -306,8 +305,10 @@ static void validate_mm(struct mm_struct *mm)
 	struct vm_area_struct *vma;
 	MA_STATE(mas, &mm->mm_mt, 0, 0);
 
-
+	mt_validate(&mm->mm_mt);
 	mas_for_each(&mas, vma, ULONG_MAX) {
+		VM_BUG_ON(mas.index != vma->vm_start);
+		VM_BUG_ON(mas.last != vma->vm_end - 1);
 #ifdef CONFIG_DEBUG_VM_RB
 		struct anon_vma *anon_vma = vma->anon_vma;
 		struct anon_vma_chain *avc;
@@ -326,6 +327,7 @@ static void validate_mm(struct mm_struct *mm)
 	}
 	VM_BUG_ON_MM(bug, mm);
 }
+
 #else // !CONFIG_DEBUG_MAPLE_TREE
 #define validate_mm(mm) do { } while (0)
 #endif // CONFIG_DEBUG_MAPLE_TREE