[PATCH v2 32/61] drivers/tee/optee: Use maple tree iterators for __check_mem_type()
From: Liam Howlett <hidden>
Date: 2021-08-17 15:55:36
Also in:
lkml
Subsystem:
op-tee driver, tee subsystem, the rest · Maintainers:
Jens Wiklander, Linus Torvalds
From: "Liam R. Howlett" <redacted> Signed-off-by: Liam R. Howlett <redacted> --- drivers/tee/optee/call.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
index 945f03da0223..071ff5d9c059 100644
--- a/drivers/tee/optee/call.c
+++ b/drivers/tee/optee/call.c@@ -582,11 +582,18 @@ 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); + + + rcu_read_lock(); + mas_for_each(&mas, vma, end) { + if (!is_normal_memory(vma->vm_page_prot)) + break; } + rcu_read_unlock(); + + if (!vma) + return 0; return -EINVAL; }
--
2.30.2