| From 568852cf34c66e0de3f1eaa32aca924f458bd2a2 Mon Sep 17 00:00:00 2001 |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| Date: Tue, 14 Jan 2020 08:13:10 +0000 |
| Subject: [PATCH] powerpc/ptdump: Only enable PPC_CHECK_WX with |
| STRICT_KERNEL_RWX |
| |
| commit f509247b08f2dcf7754d9ed85ad69a7972aa132b upstream. |
| |
| ptdump_check_wx() is called from mark_rodata_ro() which only exists |
| when CONFIG_STRICT_KERNEL_RWX is selected. |
| |
| 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/922d4939c735c6b52b4137838bcc066fffd4fc33.1578989545.git.christophe.leroy@c-s.fr |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug |
| index c59920920ddc..b915fe658979 100644 |
| --- a/arch/powerpc/Kconfig.debug |
| +++ b/arch/powerpc/Kconfig.debug |
| @@ -371,7 +371,7 @@ config PPC_PTDUMP |
| |
| config PPC_DEBUG_WX |
| bool "Warn on W+X mappings at boot" |
| - depends on PPC_PTDUMP |
| + depends on PPC_PTDUMP && STRICT_KERNEL_RWX |
| help |
| Generate a warning if any W+X mappings are found at boot. |
| |
| -- |
| 2.7.4 |
| |
