[PATCH] mm/mprotect: Fix maple tree start address in do_mprotect_pkey()

From: Liam Howlett
Date: Thu Aug 25 2022 - 16:31:02 EST


Use the untagged_addr() instead of the address passed into the function.

Fixes: 3338b715d25d (mm/mprotect: use maple tree navigation instead of vma linked list)
Signed-off-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
---
mm/mprotect.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/mprotect.c b/mm/mprotect.c
index f2b9b1da9083..3c79796be65e 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -675,7 +675,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
const bool rier = (current->personality & READ_IMPLIES_EXEC) &&
(prot & PROT_READ);
struct mmu_gather tlb;
- MA_STATE(mas, &current->mm->mm_mt, start, start);
+ MA_STATE(mas, &current->mm->mm_mt, 0, 0);

start = untagged_addr(start);

@@ -707,6 +707,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
if ((pkey != -1) && !mm_pkey_is_allocated(current->mm, pkey))
goto out;

+ mas_set(&mas, start);
vma = mas_find(&mas, ULONG_MAX);
error = -ENOMEM;
if (!vma)
--
2.35.1