From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Mon, 4 Jan 2021 19:43:36 +0000 (-0500)
Subject: drivers/tee/optee: Use maple tree iterators for __check_mem_type()
X-Git-Tag: howlett/maple_spf/20210128~31
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=32563ba6c20a1fc1044e33855cb4d6f20406bc5e;p=users%2Fjedix%2Flinux-maple.git

drivers/tee/optee: Use maple tree iterators for __check_mem_type()

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

diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
index c981757ba0d4..94acf379eaee 100644
--- a/drivers/tee/optee/call.c
+++ b/drivers/tee/optee/call.c
@@ -545,12 +545,17 @@ static bool is_normal_memory(pgprot_t p)
 
 static int __check_mem_type(struct vm_area_struct *vma, unsigned long end)
 {
-	while (vma && is_normal_memory(vma->vm_page_prot)) {
-		if (vma->vm_end >= end)
-			return 0;
-		vma = vma->vm_next;
+	MA_STATE(mas, &vma->vm_mm->mm_mt, vma->vm_start, vma->vm_start);
+
+
+	mas_for_each(&mas, vma, end) {
+		if (!is_normal_memory(vma->vm_page_prot))
+		    break;
 	}
 
+	if (!vma)
+		return 0;
+
 	return -EINVAL;
 }