| Message ID | 37517da8310f4457f28921a4edb88fb21d27b62a.1578989531.git.christophe.leroy@c-s.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e26ad936dd89d79f66c2b567f700e0c2a7103070 |
| Headers | show |
| Series | powerpc/ptdump: fix W+X verification call in mark_rodata_ro() | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (20862247a368dbb75d6e97d82345999adaacf3cc) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| snowpatch_ozlabs/needsstable | warning | Please consider tagging this patch for stable! |
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 <christophe.leroy@c-s.fr> > 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
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; }
ptdump_check_wx() also have to be called when pages are mapped by blocks. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") --- arch/powerpc/mm/pgtable_32.c | 1 + 1 file changed, 1 insertion(+)