2020-01-14 08:14:17

by Christophe Leroy

Subject: [PATCH] powerpc/ptdump: fix W+X verification call in mark_rodata_ro()

ptdump_check_wx() also have to be called when pages are mapped
by blocks.

Signed-off-by: Christophe Leroy <[email protected]>
Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot")
---
arch/powerpc/mm/pgtable_32.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 73b84166d06a..5fb90edd865e 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -218,6 +218,7 @@ void mark_rodata_ro(void)

if (v_block_mapped((unsigned long)_sinittext)) {
mmu_mark_rodata_ro();
+ ptdump_check_wx();
return;
}

--
2.13.3

2020-01-29 05:19:14

by Michael Ellerman

Subject: Re: [PATCH] powerpc/ptdump: fix W+X verification call in mark_rodata_ro()

On Tue, 2020-01-14 at 08:13:08 UTC, Christophe Leroy wrote:
> ptdump_check_wx() also have to be called when pages are mapped
> by blocks.
>
> Signed-off-by: Christophe Leroy <[email protected]>
> Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot")

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/e26ad936dd89d79f66c2b567f700e0c2a7103070

cheers