From 324b98647d95fc3c4f36ce305f831800a2e03549 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Mon, 4 Jan 2021 14:43:36 -0500 Subject: [PATCH] drivers/tee/optee: Use maple tree iterators for __check_mem_type() Signed-off-by: Liam R. Howlett --- drivers/tee/optee/call.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 945f03da0223..a83da9283e75 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -582,12 +582,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; } -- 2.50.1