mm/mprotect: Fix successful vma_merge() of next in do_mprotect_pkey()
Subsystems (3)
PATCH 1/1 mm/mprotect: Fix successful vma_merge() of next in do_mprotect_pkey()
If mprotect_fixup() successfully calls vma_merge() and replaces vma and the next vma, then the tmp variable in the do_mprotect_pkey() is not updated to point to the new vma end. This results in the loop detecting a gap between VMAs that does not exist. Fix the faulty value of tmp by setting it to the end location of the vma iterator at the end of the loop.
--- mm/mprotect.c | 1 + 1 file changed, 1 insertion(+)
mm/mprotect.c +1 -0
@@ -832,6 +832,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,if (error)break ; + tmp =vma_iter_end (&vmi); nstart = tmp; prot = reqprot; }
Signature · 1 line
2.39.0
Am Freitag, dem 24.02.2023 um 16:20 -0500 schrieb Liam R. Howlett:
Quoted 28 lines
If
mprotect_fixup()successfully callsvma_merge()and replaces vma and
the next vma, then the tmp variable in thedo_mprotect_pkey()is not updated to point to the new vma end. This results in the loop detecting
a gap between VMAs that does not exist. Fix the faulty value of tmp by
setting it to the end location of the vma iterator at the end of the loop.Reported-by Bert Karwatzki <[email protected]>Fixes 2286a6914c77 ("mm: change mprotect_fixup to vma iterator")Link:
https://lore.kernel.org/linux-mm/[email protected]/Signed-off-by Liam R. Howlett <[email protected]>---
mm/mprotect.c | 1 +1 file changed, 1 insertion(+)mm/mprotect.c +0
-0@@ -832,6 +832,7 @@ static int do_mprotect_pkey(unsigned long start,size_t len, if (error) break;
Quoted 5 lines
+ tmp =vma_iter_end(&vmi);
nstart = tmp;
prot = reqprot;
}
I tested this in linux-next-20230224 by starting stellaris from steam (which is the only way I managed to trigger the bug) and it fixes the issue for me.
Bert Karwatzki