]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
powerpc/ptdump: Only enable PPC_CHECK_WX with STRICT_KERNEL_RWX
authorChristophe Leroy <christophe.leroy@c-s.fr>
Tue, 14 Jan 2020 08:13:10 +0000 (08:13 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2020 21:34:16 +0000 (16:34 -0500)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/Kconfig.debug

index c59920920ddc433ba310272cb3352f9e246ea58b..b915fe65897922f0105a520769f0278f236665a9 100644 (file)
@@ -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.