| From e26ad936dd89d79f66c2b567f700e0c2a7103070 Mon Sep 17 00:00:00 2001 |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| Date: Tue, 14 Jan 2020 08:13:08 +0000 |
| Subject: powerpc/ptdump: Fix W+X verification call in mark_rodata_ro() |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| commit e26ad936dd89d79f66c2b567f700e0c2a7103070 upstream. |
| |
| ptdump_check_wx() also have to be called when pages are mapped |
| by blocks. |
| |
| Fixes: 453d87f6a8ae ("powerpc/mm: Warn if W+X pages found on boot") |
| Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/37517da8310f4457f28921a4edb88fb21d27b62a.1578989531.git.christophe.leroy@c-s.fr |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/powerpc/mm/pgtable_32.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/arch/powerpc/mm/pgtable_32.c |
| +++ b/arch/powerpc/mm/pgtable_32.c |
| @@ -221,6 +221,7 @@ void mark_rodata_ro(void) |
| |
| if (v_block_mapped((unsigned long)_sinittext)) { |
| mmu_mark_rodata_ro(); |
| + ptdump_check_wx(); |
| return; |
| } |
| |
